Fix lost events