Custom Spawn Fix #3