--- a/tool/Command.cpp	Fri Nov 30 15:24:38 2012 +0100
+++ b/tool/Command.cpp	Fri Nov 30 20:15:31 2012 +0100
@@ -467,19 +467,17 @@
 
 /****************************************************************************/
 
-Command::DomainList Command::selectedDomains(MasterDevice &m)
-{
-    ec_ioctl_master_t master;
+Command::DomainList Command::selectedDomains(MasterDevice &m,
+        const ec_ioctl_master_t &io)
+{
     DomainList list;
 
-    m.getMaster(&master);
-
-    PositionParser pp(master.domain_count);
+    PositionParser pp(io.domain_count);
     NumberListParser::List domList = pp.parse(domains.c_str());
     NumberListParser::List::const_iterator di;
 
     for (di = domList.begin(); di != domList.end(); di++) {
-        if (*di < master.domain_count) {
+        if (*di < io.domain_count) {
             ec_ioctl_domain_t d;
             m.getDomain(&d, *di);
             list.push_back(d);