--- a/master/slave_config.c	Thu Mar 26 15:16:21 2015 -0400
+++ b/master/slave_config.c	Thu Mar 26 17:41:57 2015 -0400
@@ -182,7 +182,7 @@
     for (i = 0; i < sc->used_fmmus; i++) {
         fmmu = &sc->fmmu_configs[i];
         if (fmmu->domain == domain && fmmu->sync_index == sync_index)
-            return fmmu->logical_start_address;
+            return fmmu->logical_domain_offset;
     }
 
     if (sc->used_fmmus == EC_MAX_FMMUS) {
@@ -216,7 +216,7 @@
             prev_fmmu->tx_size = max(fmmu->data_size, prev_fmmu->data_size);
             domain->tx_size += prev_fmmu->tx_size - old_prev_tx_size;
             tx_size = 0;
-            fmmu_logical_start_address = prev_fmmu->logical_start_address;
+            fmmu_logical_start_address = prev_fmmu->logical_domain_offset;
         }
     }
 
@@ -227,7 +227,7 @@
     sc->used_fmmus++;
     up(&sc->master->master_sem);
 
-    return fmmu->logical_start_address;
+    return fmmu->logical_domain_offset;
 }
 
 /*****************************************************************************/