diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index ee82ce88..95f97214 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -14,7 +14,7 @@ namespace SourceGit.Commands
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = "branch -l --all -v --format=\"%(refname)$%(objectname)$%(HEAD)$%(upstream)$%(upstream:trackshort)\"";
+            Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
         }
 
         public List<Models.Branch> Result()
@@ -37,7 +37,7 @@ namespace SourceGit.Commands
 
         private Models.Branch ParseLine(string line)
         {
-            var parts = line.Split('$');
+            var parts = line.Split('\0');
             if (parts.Length != 5)
                 return null;
 
diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs
index 7da324de..54ff85d6 100644
--- a/src/Commands/QueryTags.cs
+++ b/src/Commands/QueryTags.cs
@@ -9,7 +9,7 @@ namespace SourceGit.Commands
         {
             Context = repo;
             WorkingDirectory = repo;
-            Args = "tag -l --sort=-creatordate --format=\"$%(refname)$%(objectname)$%(*objectname)\"";
+            Args = "tag -l --sort=-creatordate --format=\"%(refname)%00%(objectname)%00%(*objectname)\"";
         }
 
         public List<Models.Tag> Result()
@@ -32,7 +32,7 @@ namespace SourceGit.Commands
 
         private Models.Tag ParseLine(string line)
         {
-            var subs = line.Split('$', StringSplitOptions.RemoveEmptyEntries);
+            var subs = line.Split('\0', StringSplitOptions.RemoveEmptyEntries);
             if (subs.Length == 2)
             {
                 return new Models.Tag()