handling in a more sane manner