diff --git a/core/__cdist_code_run b/core/__cdist_code_run
deleted file mode 100755
index eced45af..00000000
--- a/core/__cdist_code_run
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# This binary is executed on the remote side to execute code
-# 
-
-__cdist_code_run()
-{
-   [ $# -eq 2 ] || __cdist_usage "<object> <type>"
-
-   __cdist_object_self="$1"; shift
-   __cdist_code_type="$1"; shift
-
-   if [ ! -d "$(__cdist_object_dir "$__cdist_object_self")" ]; then
-      __cdist_exit_err "Object undefined"
-   fi  
-
-   __cdist_code="$(__cdist_object_code "$__cdist_object_self" "${__cdist_code_type}")"
-
-   __cdist_echo info "Checking code-${__cdist_code_type}"
-
-   if [ -e "$__cdist_code" ]; then
-      if [ -f "$__cdist_code" ]; then
-         if [ -x "$__cdist_code" ]; then
-            __cdist_echo info "Executing code-${__cdist_code_type}"
-            __cdist_run_shell "$__cdist_code"
-         else
-            __cdist_exit_err "$__cdist_code exists, but is not executable."
-         fi
-      else
-         __cdist_exit_err "$__cdist_code exists, but is not a file."
-      fi
-   fi
-
-   # Exit gracefully if nothing is todo
-   true
-}
diff --git a/core/__cdist_object_code_run b/core/__cdist_object_code_run
index d2e3b4a3..42e28a6a 100755
--- a/core/__cdist_object_code_run
+++ b/core/__cdist_object_code_run
@@ -32,6 +32,64 @@ __cdist_object_code_run()
    __cdist_code_run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
 
    # Code remote
-   __cdist_run_remote "__cdist_code_run" \
-      "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
+   #__cdist_run_remote "__cdist_code_run" \
+   #   "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
+   __cdist_run_remote "echo" "__cdist_code_run" \
+      "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}; exit 1"
+}
+
+
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This binary is executed on the remote side to execute code
+# 
+
+__cdist_code_run()
+{
+   [ $# -eq 2 ] || __cdist_usage "<object> <type>"
+
+   __cdist_object_self="$1"; shift
+   __cdist_code_type="$1"; shift
+
+   if [ ! -d "$(__cdist_object_dir "$__cdist_object_self")" ]; then
+      __cdist_exit_err "Object undefined"
+   fi  
+
+   __cdist_code="$(__cdist_object_code "$__cdist_object_self" "${__cdist_code_type}")"
+
+   __cdist_echo info "Checking code-${__cdist_code_type}"
+
+   if [ -e "$__cdist_code" ]; then
+      if [ -f "$__cdist_code" ]; then
+         if [ -x "$__cdist_code" ]; then
+            __cdist_echo info "Executing code-${__cdist_code_type}"
+            __cdist_run_shell "$__cdist_code"
+         else
+            __cdist_exit_err "$__cdist_code exists, but is not executable."
+         fi
+      else
+         __cdist_exit_err "$__cdist_code exists, but is not a file."
+      fi
+   fi
+
+   # Exit gracefully if nothing is todo
+   true
 }