--- a/master/master.c	Fri Apr 25 12:08:11 2008 +0000
+++ b/master/master.c	Fri Apr 25 12:13:26 2008 +0000
@@ -1315,9 +1315,6 @@
         domain_offset += domain->data_size;
     }
 
-    master->allow_config = 1; // request the current configuration
-    master->allow_scan = 1; // allow re-scanning on topology change
-
     // restart EoE process and master thread with new locking
 #ifdef EC_EOE
     ec_master_eoe_stop(master);
@@ -1337,10 +1334,12 @@
         EC_ERR("Failed to start master thread!\n");
         return -1;
     }
-
 #ifdef EC_EOE
     ec_master_eoe_start(master);
 #endif
+
+    master->allow_config = 1; // request the current configuration
+    master->allow_scan = 1; // allow re-scanning on topology change
     return 0;
 }