another map fix attempt