Fixed same location events to not include a leave event