--- gmapfield.module.org	2008-12-14 18:49:45.000000000 +0000
+++ gmapfield.module	2009-11-21 10:51:49.000000000 +0000
@@ -636,11 +636,21 @@
   $default_macro = $current_value != NULL ? $current_value : $default_value;
   
   // Define macro element
+  if ($macro_disabled) {
+    $element['gmap_macro'] = array(
+      '#type' => 'hidden',
+      '#value' => $default_macro,
+      '#field_name' => $element['#field_name'],
+      '#type_name' => $element['#type_name'],
+      '#delta' => $element['#delta'],
+      '#columns' => $element['#columns'],
+    );
+  }
+  else {
   $element['gmap_macro'] = array(
     '#type' => 'textarea',
     '#default_value' => $default_macro,
     '#title' => t('GMap Macro'),
-    '#disabled' => $macro_disabled,
     '#description' => $description,
     '#required' => $element['#required'],
     '#field_name' => $element['#field_name'],
@@ -648,6 +658,7 @@
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
   );
+  }
 
   // Marker
   // Check if can add markers
@@ -655,22 +666,32 @@
     $markers = gmap_get_marker_titles();
     // Check if can change marker
     $marker_disabled = TRUE;
-    $title = t('Choose Marker');
+    $title = t('Marker.  This field is disabled.');
     $description = t('This will be the marker to be used for the locations of this node.');
     if ($field['choose_marker']) {
       $marker_disabled = FALSE;
-      $title = t('Marker.  This field is disabled.');
+      $title = t('Choose Marker');
     }
 
     // Set marker value
     $marker_value = isset($element['#value']['marker_type']) ? $element['#value']['marker_type'] : $field['default_marker'];
     
     // Define marker element
+    if ($marker_disabled) {
+      $element['marker_type'] = array(
+        '#type' => 'hidden',
+        '#value' => $marker_value,
+        '#field_name' => $element['#field_name'],
+        '#type_name' => $element['#type_name'],
+        '#delta' => $element['#delta'],
+        '#columns' => $element['#columns'],
+      );
+    }
+    else {
     $element['marker_type'] = array(
       '#type' => 'select',
       '#default_value' => $marker_value,
       '#options' => $markers,
-      '#disabled' => $marker_disabled,
       '#title' => $title,
       '#description' => $description,
       '#required' => $element['#required'],
@@ -680,6 +701,7 @@
       '#columns' => $element['#columns'],
     );
   }
+  }
 
   return $element;
 }