Fixed handlers.