Fix event unbinding