--- a/master/fsm_master.c	Fri Mar 09 10:32:25 2007 +0000
+++ b/master/fsm_master.c	Fri Mar 09 13:16:12 2007 +0000
@@ -209,6 +209,7 @@
     if (fsm->topology_change_pending &&
             master->mode == EC_MASTER_MODE_IDLE) {
         fsm->topology_change_pending = 0;
+        fsm->tainted = 0;
 
         ec_master_eoe_stop(master);
         ec_master_destroy_slaves(master);
@@ -621,6 +622,7 @@
 
     // have all states been validated?
     if (slave->list.next == &fsm->master->slaves) {
+        fsm->topology_change_pending = 0;
         fsm->tainted = 0;
         fsm->slave = list_entry(fsm->master->slaves.next, ec_slave_t, list);
         // start writing addresses to offline slaves