fix addresses