diff --git a/_modules/maasng.py b/_modules/maasng.py
index 06d9ef6..d07f9bd 100644
--- a/_modules/maasng.py
+++ b/_modules/maasng.py
@@ -165,14 +165,14 @@
     Error codes:
         0 : Machine not found
     """
+    maas = _create_maas_client()
     try:
-        return list_machines()[hostname]
-    except KeyError:
+        return json.loads(maas.get(u'api/2.0/machines/?hostname='+hostname).read())[0]
+    except IndexError:
         return {"error":
                        { 0: "Machine not found" }
                }
 
-
 def list_machines(status_filter=None):
     """
     Get list of all machines from maas server