Dynamic spawn fix