This should fix the spawn location bugs.