Attempt to fix spawn bug