Fix lack of map
Revert "Fix lack of map"

This reverts commit 7a3769594cacab228ca027b05a38dedbfadb68b1.
Fix lack of map