diff --git a/modules/orionode/lib/sites.js b/modules/orionode/lib/sites.js
index <HASH>..<HASH> 100644
--- a/modules/orionode/lib/sites.js
+++ b/modules/orionode/lib/sites.js
@@ -73,7 +73,8 @@ function virtualHost(vhost, req, res, next) {
 				if (options.configParams["orion.single.user"]) {
 					path = mPath.join(options.workspaceDir, mapping.Target, relative);
 				} else {
-					path = mPath.join(options.workspaceDir, username.substring(0, 2), username, "OrionContent", mapping.Target, relative);
+					var file = fileUtil.getFile(req, mapping.Target);
+					path = mPath.join(file.path, relative);
 				}
 				if (fs.existsSync(path) && fs.lstatSync(path).isFile()) {
 					res.sendFile(path);
Bug <I> - self-hosting is broken in orion.eclipse.org