Fixes handlers being applied multiple times