Fixed static spawn issue