diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index 24ebc102..c0de5b8b 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -68,8 +68,10 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
             echo "Executing manifest ${__cdist_manifest} ..."
 
             # Make variables available to non-core
-            export $__cdist_name_object="$__cdist_object"
-            export $__cdist_name_object_id="$__cdist_object_id"
+            set -x
+            export $__cdist_name_var_object="$__cdist_cur_object_dir"
+            export $__cdist_name_var_object_id="$__cdist_object_id"
+            set +x
 
             cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
                "$__cdist_new_objects_dir" "$__cdist_object_id"