fix address2 handling