Internal event handler modifications as fix for #10