Fix leave and join project overlap