using v2.1 of the SDK & fix in address cell adding a blank address every time