diff --git a/configure b/configure
index e605c088..98641633 100755
--- a/configure
+++ b/configure
@@ -303,13 +303,12 @@ EOF
                 rm ${QP_ROOT}/external/opam_installer.sh
                 source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
 
-                execute << EOF
-                opam switch create ocaml-base-compiler.4.07.1     || exit 1
-                ${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
+                opam switch create ocaml-base-compiler.4.07.1
+                opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
 
-                eval $(${QP_ROOT}/bin/opam env)
+                eval $(opam env)
                 opam install -y ${OCAML_PACKAGES}  || exit 1
-EOF
+
             else
                 # Conventional commands
                 execute << EOF
@@ -322,14 +321,13 @@ EOF
                   echo \${QP_ROOT}/bin \
                   | sh \${QP_ROOT}/external/opam_installer.sh 
 EOF
-                execute << EOF
-                  rm \${QP_ROOT}/external/opam_installer.sh
-                  source \${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
-                  opam switch create ocaml-base-compiler.4.07.1     || exit 1
-                  \${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
+                rm \${QP_ROOT}/external/opam_installer.sh
+                source \${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
+                opam switch create ocaml-base-compiler.4.07.1     || exit 1
+                opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
+                eval $(opam env)
 EOF
                 execute << EOF
-                  eval \$(\${QP_ROOT}/bin/opam env)
                   opam install -y \${OCAML_PACKAGES}  || exit 1
 EOF
             fi