issue #22298: fix new-address bug