bug fix in event bindings