Empty Address bug fix