Fixes #645, but in a very limited scope, just for map.
Bigger change should be done in a dot or major release vs fix release
snapshot