Autospawn fix