fixed conflicting event handlers - #192