some more checks to re-set address.