diff --git a/core/__cdist_object_all b/core/__cdist_object_all
index 59457e3c..abac594d 100755
--- a/core/__cdist_object_all
+++ b/core/__cdist_object_all
@@ -33,12 +33,19 @@ __cdist_object_all_object_all()
    # Ensure object dir exists, so marker can be created
    mkdir -p "${__cdist_out_object_dir}"
 
+   BUG: 
+      - where does $__cdist_objects_created get setup?
+      - why do we use a file?
+      core/__cdist_object_manifest_run:         touch "$__cdist_objects_created"
+
+
+   exit 23
    # Loop until we do not create new objects anymore
    # which is equal to all objects have been run
-   touch "$__cdist_object_all_object_all_objects_created"
-   while [ -f "$__cdist_object_all_object_all_objects_created" ]; do
+   touch "$__cdist_objects_created"
+   while [ -f "$__cdist_objects_created" ]; do
       # Assume we're done after this run
-      rm "$__cdist_object_all_object_all_objects_created"
+      rm "$__cdist_objects_created"
 
       # Get listing of objects
       __cdist_object_all_object_list "$__cdist_out_object_dir" > \