Actually fixed spawn