Revert "Fix map"

This reverts commit 834966a08a821ee5788663e4903755cccc08e001.
Fix map #2