Fixed broken event bindings