diff --git a/bin/cdist b/bin/cdist
index f4d67616..d6a6da3b 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -478,15 +478,14 @@ if __name__ == "__main__":
     try:
         logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
         
-        # Import generic cdist options
-        sys.path.insert(0, 
-            os.path.abspath(os.path.join(os.path.dirname(__file__),
-            '../lib')))
-        import cdist
-
         if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
             emulator()
         else:
+            cdist_lib = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                '../lib'))
+            sys.path.insert(0, cdist_lib)
+
+            import cdist
             import cdist.banner
             import cdist.exec
             import cdist.path