Fix event handlers binding