Fixed spawnpoint detection