diff --git a/src/engine/build.bat b/src/engine/build.bat
index d89536e2d..dfffb005c 100644
--- a/src/engine/build.bat
+++ b/src/engine/build.bat
@@ -40,7 +40,7 @@ goto :eof
 
 
 :Test_Option
-REM Tests wether the given string is in the form of an option: "-*"
+REM Tests wether the given string is in the form of an option: "--*"
 setlocal & endlocal
 setlocal
 set test=%1
@@ -48,7 +48,7 @@ set test=###%test%###
 set test=%test:"###=%
 set test=%test:###"=%
 set test=%test:###=%
-if not [-] == [%test:~0,1%] set _error_=
+if not [-] == [%test:~1,1%] set _error_=
 endlocal
 goto :eof
 
diff --git a/src/engine/build.jam b/src/engine/build.jam
index e34d89905..5cc4505f1 100644
--- a/src/engine/build.jam
+++ b/src/engine/build.jam
@@ -55,13 +55,15 @@ if $(with-python)
         {
             --python-lib ?=
                 [ GLOB [ .path $(python-location) libs ] : "python$(v).lib" ]
-                [ GLOB $(python-location) $(Path) $(PATH) $(path) : "python$(v).dll" ]
+                [ GLOB $(python-location) [ .path $(python-location) libs ]
+                    $(Path) $(PATH) $(path) : "python$(v).dll" ]
                 ;
             if ! $(--python-lib[2])
             {
                 --python-lib = ;
             }
         }
+        --python-lib = $(--python-lib[1]) ;
     }
     else if $(OS) = MACOSX
     {