Bug fix for adding event handlers