additional change to make sure addresses don't come back as undefined