fix handlers bug