fixes handlers maybe