fixed address-location issue