Fixing Address mapping

Signed-off-by: AlexLalung <al@neomajes.com>