Fix event binding