Fixed the Way that Handlers Work