diff --git a/IPython/parallel/client/client.py b/IPython/parallel/client/client.py
index e7fd57d..cb8e55a 100644
--- a/IPython/parallel/client/client.py
+++ b/IPython/parallel/client/client.py
@@ -1308,7 +1308,11 @@ class Client(HasTraits):
         verbose : bool
                 Whether to return lengths only, or lists of ids for each element
         """
-        engine_ids = self._build_targets(targets)[1]
+        if targets == 'all':
+            # allow 'all' to be evaluated on the engine
+            engine_ids = None
+        else:
+            engine_ids = self._build_targets(targets)[1]
         content = dict(targets=engine_ids, verbose=verbose)
         self.session.send(self._query_socket, "queue_request", content=content)
         idents,msg = self.session.recv(self._query_socket, 0)
diff --git a/IPython/parallel/controller/hub.py b/IPython/parallel/controller/hub.py
index 4e2e5a8..300b496 100644
--- a/IPython/parallel/controller/hub.py
+++ b/IPython/parallel/controller/hub.py
@@ -430,7 +430,7 @@ class Hub(SessionFactory):
         """turn any valid targets argument into a list of integer ids"""
         if targets is None:
             # default to all
-            targets = self.ids
+            return self.ids
 
         if isinstance(targets, (int,str,unicode)):
             # only one target specified