Fixed the spawn issue