Fixed Handler Bug!