countrycode field setting lost when editing a node

if you edit an existing node containing cck_phone fields in D7 (release candidate 1 and 2), the default value for countrycode is displayed, not the value that already was existing for that node, so you have to select it again every time you edit the node. This is rather unconvenient.