Improved excepting handling a tiny bit