diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 781c15c4..a2f7a2f1 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -55,9 +55,9 @@ __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}"
 __cdist_explorer_run_global
 __cdist_manifest_run_init
 __cdist_object_all            __cdist_object_prepare
+__cdist_object_all            __cdist_object_run
 exit 1
 
-__cdist_object_all            __cdist_object_run
 __cdist_cache
 
 __cdist_echo info "cdist $__cdist_version: Successfully finished run"
diff --git a/core/__cdist_object_explorer_run b/core/__cdist_object_explorer_run
index 1f266dca..b082ce0b 100755
--- a/core/__cdist_object_explorer_run
+++ b/core/__cdist_object_explorer_run
@@ -26,15 +26,16 @@
 
 __cdist_object_explorer_run()
 {
+   set -x
    __cdist_object_self="$1"; shift
 
    __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
    __cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
 
    # Check if type of object has >= 1 explorer
-   __cdist_has_explorer="$(__cdist_dir_listing "$(__cdist_type_explorer_dir "$__cdist_type")")"
+   __cdist_has_explorer="$(__cdist_dir_listing "$(__cdist_type_explorer_dir "$__cdist_type")" | wc -l)"
    # Run the type explorers for the current object if any
-   if [ "$__cdist_has_explorer" ]; then
+   if [ "$__cdist_has_explorer" -ge 1 ]; then
       if ! __cdist_type_explorer_pushed "$__cdist_type"; then
          # FIXME: variables!
          src_dir="$(__cdist_type_explorer_dir "$__cdist_type")"