fix handlers doubling