World-gen fix