- fix handlers