fix address bugs