Fix Handler Issues