Custom Spawn Fix #5