diff --git a/lib/mcollective/util/tasks_support.rb b/lib/mcollective/util/tasks_support.rb
index 1538abdd..e0a9d550 100644
--- a/lib/mcollective/util/tasks_support.rb
+++ b/lib/mcollective/util/tasks_support.rb
@@ -79,7 +79,10 @@ def aio_wrapper_path
           legacy = File.join(aio_bin_path, "task_wrapper.exe")
           return legacy if File.exist?(legacy)
 
-          File.join(aio_bin_path, "execution_wrapper.exe")
+          legacy_puppet = File.join(aio_bin_path, "execution_wrapper.exe")
+          return legacy_puppet if File.exist?(legacy_puppet)
+          
+          File.join(aio_bin_path, "execution_wrapper.bat")
         else
           legacy = File.join(aio_bin_path, "task_wrapper")
           return legacy if File.exist?(legacy)