diff --git a/app/press/Plugin.java b/app/press/Plugin.java
index 30383d3..44c26c7 100644
--- a/app/press/Plugin.java
+++ b/app/press/Plugin.java
@@ -53,9 +53,9 @@ public static String addSingleJS(String fileName, String dir, boolean compress)
             }
         } else {
         	if (null != dir && !dir.isEmpty())
-        		src = dir + fileName;
+        		src = (dir.equals("/") ? "" : dir) + fileName;
         	else
-        		src = compressor.srcDir + fileName;
+        		src = (compressor.srcDir.equals("/") ? "" : compressor.srcDir) + fileName;
         	if (press.PluginConfig.cacheBuster){
         		src += "?" + srcFile.lastModified();
         	}
@@ -80,7 +80,7 @@ public static String addSingleCSS(String fileName) {
                 src = requestKey;
             }
         } else {
-            src = compressor.srcDir + fileName;
+            src = (compressor.srcDir.equals("/") ? "" : compressor.srcDir) + fileName;
         }
 
         return getLinkTag(src);
@@ -102,7 +102,7 @@ public static String addJS(String src, boolean compress, int pos) {
             if (performCompression()) {
                 result += compressor.add(fileName, compress, pos) + "\n";
             } else {
-            	String name = baseUrl + fileName;
+            	String name = (baseUrl.equals("/") ? "" : baseUrl) + fileName;
             	if (press.PluginConfig.cacheBuster){
             		VirtualFile srcFile = checkJSFileExists(fileName, baseUrl);
             		if (null != srcFile)
@@ -131,7 +131,7 @@ public static String addCSS(String src, boolean compress, int pos) {
             if (performCompression()) {
                 result += compressor.add(fileName, compress, pos) + "\n";
             } else {
-            	String name = baseUrl + fileName;
+            	String name = (baseUrl.equals("/") ? "" : baseUrl) + fileName;
             	if (press.PluginConfig.cacheBuster){
             		VirtualFile srcFile = checkJSFileExists(fileName, baseUrl);
             		if (null != srcFile)