diff --git a/core/__cdist_manifest_run b/core/__cdist_manifest_run
index 60d3fea3..cf85d646 100755
--- a/core/__cdist_manifest_run
+++ b/core/__cdist_manifest_run
@@ -45,8 +45,8 @@ __cdist_manifest_run()
    # The actual run
    #
 
-   # Ensure binaries are existing
-   __cdist_type_build_emulation "${__cdist_out_type_bin_dir}" \
+   # Ensure binaries are existing - FIXME: move error handling into __cdist_type_build_emulation
+   __cdist_type_build_emulation \
       || __cdist_exit_err "Failed to build type emulation binaries"
 
    __cdist_run_shell "${__cdist_manifest}"