Correct 2D map fix #2