Address capture bug fix

Address capture bug fix