fix address collection