1.8: Fixed maps.