Revert "fixed address and map"

This reverts commit 114f13f9e8da5d62f921b5c8f9a940e02877549d.