Added some arbitrary bounds, not sure if that's the right way to go but,
man, they simplified code!