diff --git a/Assets/Rivet/Editor/Util/Builder.cs b/Assets/Rivet/Editor/Util/Builder.cs
index 5b5e7fa..37f55a1 100644
--- a/Assets/Rivet/Editor/Util/Builder.cs
+++ b/Assets/Rivet/Editor/Util/Builder.cs
@@ -256,11 +256,7 @@ private static string FindPlayerExecutablePath(string buildPath, BuildTarget bui
             }
             else
             {
-                executablePath = Path.Combine(buildPath, productName);
-                if (buildTarget == BuildTarget.StandaloneWindows || buildTarget == BuildTarget.StandaloneWindows64)
-                {
-                    executablePath += ".exe";
-                }
+                executablePath = buildPath;
             }
 
             if (!File.Exists(executablePath))
@@ -286,7 +282,9 @@ public static string GetBuildName(string baseName, BuildTarget target, bool isSe
             if (target == BuildTarget.StandaloneOSX && !isServer)
             {
                 return baseName + ".app";
-            } else if (target == BuildTarget.StandaloneWindows || target == BuildTarget.StandaloneWindows64) {
+            }
+            if (target == BuildTarget.StandaloneWindows || target == BuildTarget.StandaloneWindows64)
+            {
                 return baseName + ".exe";
             }
             return baseName;