map fix, again