diff --git a/src/http/httpvhost.cpp b/src/http/httpvhost.cpp
index 74b557102..786b614e6 100644
--- a/src/http/httpvhost.cpp
+++ b/src/http/httpvhost.cpp
@@ -2607,7 +2607,7 @@ int HttpVHost::configContext(const XmlNode *pContextNode)
         }
   
         //If pLocation does not have tail /, add it now
-        if ( *(pLocation + strlen(pLocation) - 1) != '/' )
+        if (!match && *(pLocation + strlen(pLocation) - 1) != '/' )
         {
             if (!needUpdate)
                 defLocation.setStr(pLocation);
diff --git a/src/main/lshttpdmain.cpp b/src/main/lshttpdmain.cpp
index 64b396bec..c27032890 100644
--- a/src/main/lshttpdmain.cpp
+++ b/src/main/lshttpdmain.cpp
@@ -81,7 +81,7 @@
 /***
  * Do not change the below format, it will be set correctly while packing the code
  */
-#define BUILDTIME  " (built: Fri Jan  3 13:33:02 UTC 2020)"
+#define BUILDTIME  " (built: Fri Jan  3 21:54:03 UTC 2020)"
 
 #define GlobalServerSessionHooks (LsiApiHooks::getServerSessionHooks())