fix map and world