Fix issue with address request