diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index 7bdbed955..53ea1330f 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -65,7 +65,9 @@ namespace Discord.Commands
                         return ParseResult.FromError(CommandError.ParseFailed, "There must be at least one character of whitespace between arguments.");
                     else
                     {
-                        curParam = command.Parameters.Count > argList.Count ? command.Parameters[argList.Count] : null;
+                        if (curParam == null)
+                            curParam = command.Parameters.Count > argList.Count ? command.Parameters[argList.Count] : null;
+
                         if (curParam != null && curParam.IsRemainder)
                         {
                             argBuilder.Append(c);
@@ -116,11 +118,7 @@ namespace Discord.Commands
                     {
                         paramList.Add(typeReaderResult);
 
-                        if (curPos == endPos)
-                        {
-                            curParam = null;
-                            curPart = ParserPart.None;
-                        }
+                        curPart = ParserPart.None;
                     }
                     else
                     {