Fix getAddress