bug fix for addresses