diff --git a/js/FileRetriever.js b/js/FileRetriever.js
index bb1ea9d25..8d6a58103 100644
--- a/js/FileRetriever.js
+++ b/js/FileRetriever.js
@@ -91,7 +91,7 @@ FileRetriever.retrieveFile = function(filepath,contextPath,callback) {
 		requester = httpRequest;
 	} else {
 		// It's a file requested in a file context
-		result.path = path.resolve(path.dirname(contextPath),filepath);
+		result.path = path.resolve(contextPath,filepath);
 		result.extname = path.extname(result.path);
 		result.basename = path.basename(result.path,result.extname);
 		requester = fileRequest;
diff --git a/js/Recipe.js b/js/Recipe.js
index 4ffba500d..ba72b6a11 100755
--- a/js/Recipe.js
+++ b/js/Recipe.js
@@ -70,7 +70,7 @@ var Recipe = function(options,callback) {
 			if(err) {
 				me.callback(err);
 			} else {
-				me.processRecipeFile(task.recipe,data.text,data.path);
+				me.processRecipeFile(task.recipe,data.text,path.dirname(data.path));
 				callback(null);
 			}
 		});