Fix event using's