Fix event binding and override issue