diff --git a/setup.cfg b/setup.cfg
index d0594a39af5ed28376848e39650195c2f411a55d..210fa6e3462b879451f88431f5c7257809219e93 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = quingo
-version = 0.1.6
+version = 0.1.7
 author = Xiang Fu
 author_email = gtaifu@gmail.com
 use_2to3 = False
diff --git a/src/quingo/core/manager.py b/src/quingo/core/manager.py
index bdf646880ae27313dea983b7c03f16934abb2eee..9f9a21474d5217386e07a4eb2783f321545f9c43 100755
--- a/src/quingo/core/manager.py
+++ b/src/quingo/core/manager.py
@@ -555,7 +555,7 @@ class Runtime_system_manager:
 
         # The project root directory is added to the compiler module search path.
         compile_cmd = (
-            '{header}"{qgc_path}" "{main_fn}"{sep} -I "{root_dir}" -o "{qasm_fn}"'.format(
+            '{header}{qgc_path} "{main_fn}"{sep} -I "{root_dir}" -o "{qasm_fn}"'.format(
                 header=header,
                 qgc_path=quingoc_path,
                 main_fn=str(self.main_file_fn),
diff --git a/src/quingo/install_quingoc.py b/src/quingo/install_quingoc.py
index b645e2ae76506811a0366b93de3ec7eba1764a00..ec1beb2fdf80575e1393b7f3085e66bc37c5fb7f 100644
--- a/src/quingo/install_quingoc.py
+++ b/src/quingo/install_quingoc.py
@@ -360,5 +360,7 @@ if __name__ == "__main__":
     if quingoc_path is None:
         download_and_install_latest_quingoc()
     else:
+        if quingoc_path[0] != '"':
+            quingoc_path = '"{}"'.format(quingoc_path)
         if check_update(quingoc_path):
             download_and_install_latest_quingoc(pathlib.Path(quingoc_path))