diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 9dd1881578..8c6f8ccacb 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -534,6 +534,12 @@ class ExecDriver < VirtualMachineDriver
 
         action = VmmAction.new(self, id, :attach_disk, drv_message)
 
+        # Bug #1355, argument character limitation in ESX
+        # Message not used in vmware anyway
+        if @hypervisor == "vmware"
+            drv_message = "drv_message" 
+        end
+
         steps = [
             # Perform a PROLOG on the disk
             {