Fix for units joining game