Fix a race condition at tick end
Preserve ordering of worlds correctly