Custom Spawn Fix #4