Validate address bug fix