--- cck_gmapaddress.module	Tue Oct 14 23:10:14 2008
+++ cck_gmapaddress.module	Tue Oct 21 17:54:41 2008
@@ -310,7 +310,7 @@
 										  );
 	  $key = -1;
 	  foreach ($node_field as $key => $item){
-		if ($field['#multiple'] || $key == 0){
+		if ($field['multiple'] || $key == 0){
 			$form[$field['field_name']][$key] = array('#tree' => TRUE);
 			$form[$field['field_name']][$key]['address'] = array(
 				'#type' => 'textfield',
@@ -320,12 +320,12 @@
 		}
 	  }
 	  $key++;
-	  //Add empty field for multiple addresses
-	  for ($i = $key;$i < 1 - $key + (($field['#multiple'])?3:0);$i++){
+	  //Add empty field(s)
+	  for ($i = $key;$i < (($field['multiple'])?$key + 3:!$key);$i++){
 		$form[$field['field_name']][$i] = array('#tree' => TRUE);
 		$form[$field['field_name']][$i]['address'] = array(
 				'#type' => 'textfield',
-				'#default_value' => $item['address'],
+				'#default_value' => '',
 				'#required' => ($field['required'] && $i == 0),
 		);
 	  }