Fix spawn unit