Custom Spawn Fix #2