diff --git a/ccnode/ccnodehandlers.py b/ccnode/ccnodehandlers.py
index 87b272d44fc1e61aef833f79a3d40565dc6f9418..81e6a8dd621c79dccddfadb8669195a0683ee947 100644
--- a/ccnode/ccnodehandlers.py
+++ b/ccnode/ccnodehandlers.py
@@ -127,7 +127,7 @@ class NodeHandler(RpcHandler):
         '''
         vms_info = []
         vm_info = {}
-        tags = VM_TAG_MAP.keys() if tags is None else tags 
+        tags = [] if tags is None else tags 
         logging.debug('list_vm: processing tags %s' % tags)
         # ensure that vm name is always returned
         if not tags.__contains__('vm'):
@@ -168,7 +168,7 @@ class NodeHandler(RpcHandler):
         '''
         if vm_names is None:
             #fetch all vm names in hypervisor
-            vm_names = [vm.get_name() for vm in self.hv_handle._vm_list]
+            vm_names = gen_vm_names(self.hv_handle)
         logging.debug('stop_vm: stopping vms %s' % vm_names)
         for vm in vm_names:
             try: