Fixed handling of full address.