- Fixed handlers.