Fixed spawn bug