Join/leave trip quick fix