Fix instance spawning