WIP: fix addresses parts
WIP: fix addresses parts