diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 8d066664..d6ec4f72 100755
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -66,6 +66,9 @@ namespace SparkleLib.Git {
             string target_folder, bool fetch_prior_history) : base (server, required_fingerprint,
                 remote_path, target_folder, fetch_prior_history)
         {
+            if (RemoteUrl.ToString ().StartsWith ("ssh+"))
+                RemoteUrl = new Uri ("ssh" + RemoteUrl.ToString ().Substring (RemoteUrl.ToString ().IndexOf ("://")));
+
             Uri uri = RemoteUrl;
 
             if (!uri.Scheme.Equals ("ssh") && !uri.Scheme.Equals ("https") &&
diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
index 7c91202b..8c2139e2 100755
--- a/SparkleLib/SparkleFetcherBase.cs
+++ b/SparkleLib/SparkleFetcherBase.cs
@@ -108,9 +108,6 @@ namespace SparkleLib {
 
             TargetFolder = target_folder;
 
-            if (server.StartsWith ("ssh+"))
-                server = "ssh" + server.Substring (server.IndexOf ("://"));
-
             RemoteUrl = new Uri (server + remote_path);
             IsActive  = false;
         }