diff --git a/mininet/cli.py b/mininet/cli.py
index 46379281e3ad0e452044baf804ab02d042f43a25..469f4b10b5ff3ff2040ef4ebe59a49c4dc93f5da 100644
--- a/mininet/cli.py
+++ b/mininet/cli.py
@@ -48,13 +48,10 @@ class CLI( Cmd ):
     def __init__( self, mininet ):
         self.mn = mininet
         self.nodemap = {} # map names to Node objects
-        for node in self.mn.nodes.values():
+        self.nodelist = self.mn.switches + self.mn.hosts + self.mn.controllers
+        for node in self.nodelist:
             self.nodemap[ node.name ] = node
-        for cname, cnode in self.mn.controllers.iteritems():
-            self.nodemap[ cname ] = cnode
-        self.nodelist = self.nodemap.values()
         Cmd.__init__( self )
-
         warn( '*** Starting CLI:\n' )
         self.cmdloop()