Hopefully fixed spawning out of window