diff --git a/NadekoBot.Core/NadekoBot.Core.csproj b/NadekoBot.Core/NadekoBot.Core.csproj
index d654b138..9a02f149 100644
--- a/NadekoBot.Core/NadekoBot.Core.csproj
+++ b/NadekoBot.Core/NadekoBot.Core.csproj
@@ -3,13 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/NadekoBot.Core/Services/Impl/BotCredentials.cs b/NadekoBot.Core/Services/Impl/BotCredentials.cs
index 767f5bf0..4adbb9a5 100644
--- a/NadekoBot.Core/Services/Impl/BotCredentials.cs
+++ b/NadekoBot.Core/Services/Impl/BotCredentials.cs
@@ -76,10 +76,20 @@ namespace NadekoBot.Core.Services.Impl
                 if (!string.IsNullOrWhiteSpace(cmd))
                     RestartCommand = new RestartConfig(cmd, args);
 
-                if (string.IsNullOrWhiteSpace(ShardRunCommand))
-                    ShardRunCommand = "dotnet";
-                if (string.IsNullOrWhiteSpace(ShardRunArguments))
-                    ShardRunArguments = "run -c Release -- {0} {1}";
+                if (Environment.OSVersion.Platform == PlatformID.Unix)
+                {
+                    if (string.IsNullOrWhiteSpace(ShardRunCommand))
+                        ShardRunCommand = "dotnet";
+                    if (string.IsNullOrWhiteSpace(ShardRunArguments))
+                        ShardRunArguments = "run -c Release -- {0} {1}";
+                }
+                else //windows
+                {
+                    if (string.IsNullOrWhiteSpace(ShardRunCommand))
+                        ShardRunCommand = "NadekoBot.exe";
+                    if (string.IsNullOrWhiteSpace(ShardRunArguments))
+                        ShardRunArguments = "{0} {1}";
+                }
                 
                 var portStr = data[nameof(ShardRunPort)];
                 if (string.IsNullOrWhiteSpace(portStr))
diff --git a/NadekoBot.Core/Services/ShardsCoordinator.cs b/NadekoBot.Core/Services/ShardsCoordinator.cs
index 0aebe046..97a50a44 100644
--- a/NadekoBot.Core/Services/ShardsCoordinator.cs
+++ b/NadekoBot.Core/Services/ShardsCoordinator.cs
@@ -293,6 +293,8 @@ namespace NadekoBot.Core.Services
 
         private Process StartShard(int shardId)
         {
+            Console.WriteLine(_creds.ShardRunCommand);
+            Console.WriteLine(_creds.ShardRunArguments);
             return Process.Start(new ProcessStartInfo()
             {
                 FileName = _creds.ShardRunCommand,