Revert "to revert"

This reverts commit 2860522359b162925bed5cd97d54e2d30788ec8b.
Fixed map bug