Added multiple event handler registration bug