fix handlers