Hotfix for the SpawnHandler