diff --git a/mRemoteV1/Connection/Connection.Protocol.IntegratedProgram.vb b/mRemoteV1/Connection/Connection.Protocol.IntegratedProgram.vb
index 113df5ad..8b4a728f 100644
--- a/mRemoteV1/Connection/Connection.Protocol.IntegratedProgram.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.IntegratedProgram.vb
@@ -29,7 +29,7 @@ Namespace Connection
 
                     With _process.StartInfo
                         .UseShellExecute = True
-                        .FileName = _externalTool.FileName
+                        .FileName = _externalTool.ParseArguments(_externalTool.FileName)
                         .Arguments = _externalTool.ParseArguments(_externalTool.Arguments)
                     End With
 
diff --git a/mRemoteV1/Tools/ExternalTool.vb b/mRemoteV1/Tools/ExternalTool.vb
index da859af1..656dcb0e 100644
--- a/mRemoteV1/Tools/ExternalTool.vb
+++ b/mRemoteV1/Tools/ExternalTool.vb
@@ -57,7 +57,7 @@ Namespace Tools
                 Dim process As New Process()
                 With process.StartInfo
                     .UseShellExecute = True
-                    .FileName = FileName
+                    .FileName = ParseArguments(FileName)
                     .Arguments = ParseArguments(Arguments)
                 End With