fix address1 and 2