Properly exschange pre-filled addresses

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>