Revert "Revert "fixed address and map""

This reverts commit 7c5159c8d0c0cbb2750b94d9aebafb61b86a97c5.