Fix for event bindings issue