minor fix in address mapping