fixing handler