diff --git a/configs/client-default.js b/configs/client-default.js
index f5788982..b967af8b 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -302,7 +302,9 @@ module.exports = function(options) {
         {
             packagePath: "plugins/c9.ide.language/language",
             workspaceDir: workspaceDir,
-            staticPrefix: options.packed || !options.baseUrl ? staticPrefix : options.baseUrl + staticPrefix,
+            staticPrefix: options.packed
+                ? staticPrefix
+                : options.ideBaseUrl + "/uph" + staticPrefix,
             workerPrefix: options.CORSWorkerPrefix // "/static/standalone/worker"
         },
         "plugins/c9.ide.language/keyhandler",
diff --git a/plugins/c9.static/unpacked_helper.js b/plugins/c9.static/unpacked_helper.js
index bf461c26..15a3fe9a 100644
--- a/plugins/c9.static/unpacked_helper.js
+++ b/plugins/c9.static/unpacked_helper.js
@@ -14,8 +14,8 @@ function plugin(options, imports, register) {
     var assert = require("assert");
     var baseUrl = options.baseUrl;
     var ideBaseUrl = options.ideBaseUrl;
-    assert(options.baseUrl, "baseUrl must be set");
-    assert(options.ideBaseUrl, "ideBaseUrl must be set");
+    assert(baseUrl, "baseUrl must be set");
+    assert(ideBaseUrl, "ideBaseUrl must be set");
     
     var balancers = [
         baseUrl + "/uph",