Fix bug in addresses