Fixed issue with spawn location