Fix spawn