diff --git a/core/__cdist_object_code_run b/core/__cdist_object_code_run
index 734db5c9..a932f655 100755
--- a/core/__cdist_object_code_run
+++ b/core/__cdist_object_code_run
@@ -26,7 +26,7 @@ __cdist_object_code_run()
 {
    [ $# -eq 1 ] || __cdist_exit_err "<object>"
 
-   # set -x
+   set -x
 
    if [ ! -d "$(__cdist_object_dir "$1")" ]; then
       __cdist_exit_err "Object undefined"
@@ -46,5 +46,5 @@ __cdist_object_code_run()
 
       __cdist_run_remote $(__cdist_remote_object_code "$1")
    fi
-   # set +x
+   set +x
 }
diff --git a/core/__cdist_object_run b/core/__cdist_object_run
index 086bfb0b..d122bdd4 100755
--- a/core/__cdist_object_run
+++ b/core/__cdist_object_run
@@ -64,6 +64,7 @@ __cdist_object_run()
                 "$(__cdist_remote_object_dir "$__cdist_object_self")"
       __cdist_echo debug "Before run"
       __cdist_object_code_run "$__cdist_object_self"
+      __cdist_echo debug "Object run done
 
       # Mark this object as done
       touch "$__cdist_object_finished"