Over event fix