fixed double handlers