Fixed double spawn