adding the patch for the address field with the small changes