Fixes first spawn (again)