diff --git a/__whiledir.cpp b/__whiledir.cpp
index 3e1730b..bba6cd4 100644
--- a/__whiledir.cpp
+++ b/__whiledir.cpp
@@ -17,17 +17,23 @@ namespace jet {
 	   entries.push_back(entry);
 	 std::sort(entries.begin(), entries.end(), [](const auto &a, const auto &b) { return a.path() < b.path(); });
 	 for(const auto &entry : entries) {
-	    global.variables[variables["fullpath"]] = entry.path();
-	    global.variables[variables["filename"]] = entry.path().filename();
-	    global.variables[variables["filenamenoextension"]] = entry.path().stem();
+	    if(variableDefined("fullpath"))
+	      global.variables[variables["fullpath"]] = entry.path();
+	    if(variableDefined("filename"))
+	      global.variables[variables["filename"]] = entry.path().filename();
+	    if(variableDefined("filenamenoextension"))
+	      global.variables[variables["filenamenoextension"]] = entry.path().stem();
 	    processContainer(container);
 	    container.reset();	    
 	 }	 
       } else {	 
 	 for(auto const &entry : std::filesystem::directory_iterator(variables["path"].str())) {
-	    global.variables[variables["fullpath"]] = entry.path();
-	    global.variables[variables["filename"]] = entry.path().filename();
-	    global.variables[variables["filenamenoextension"]] = entry.path().stem();
+	    if(variableDefined("fullpath"))
+	      global.variables[variables["fullpath"]] = entry.path();
+	    if(variableDefined("filename"))
+	      global.variables[variables["filename"]] = entry.path().filename();
+	    if(variableDefined("filenamenoextension"))
+	      global.variables[variables["filenamenoextension"]] = entry.path().stem();
 	    processContainer(container);
 	    container.reset();
 	 }
diff --git a/jet-2.0 b/jet-2.0
index e78ac53..8cf815c 100755
Binary files a/jet-2.0 and b/jet-2.0 differ