dont overwrite the address values with empty values from the getAddress call
bump to 4.0.19