--- a/tool/CommandRegWrite.cpp	Thu Mar 11 15:03:52 2010 +0100
+++ b/tool/CommandRegWrite.cpp	Thu Mar 11 15:17:25 2010 +0100
@@ -81,7 +81,6 @@
 
 void CommandRegWrite::execute(const StringVector &args)
 {
-	MasterIndexList masterIndices;
     stringstream strOffset, err;
     ec_ioctl_slave_reg_t data;
     ifstream file;
@@ -101,13 +100,6 @@
         throwInvalidUsageException(err);
     }
   
-	masterIndices = getMasterIndices();
-    if (masterIndices.size() != 1) {
-        err << getName() << " requires to select a single master!";
-        throwInvalidUsageException(err);
-    }
-    MasterDevice m(masterIndices.front());
-
     if (getDataType().empty()) {
         if (args[1] == "-") {
             loadRegData(&data, cin);
@@ -157,6 +149,7 @@
         throwInvalidUsageException(err);
     }
 
+    MasterDevice m(getSingleMasterIndex());
     try {
         m.open(MasterDevice::ReadWrite);
     } catch (MasterDeviceException &e) {