diff --git a/src/tokeniser.c b/src/tokeniser.c
index 1bb2fe5..7cec970 100644
--- a/src/tokeniser.c
+++ b/src/tokeniser.c
@@ -39,7 +39,10 @@ char **tokenise(char *line, int *numTokens) {
         if (*c == ',' && !inBracket) {
             *c = '\0';
             tokens[(*numTokens)++] = currentToken;
-            currentToken = c + 2; // Skip ", "
+            currentToken = c + 1;
+            while (*currentToken == ' ') {
+                currentToken++;
+            }
         }
     }
 
@@ -85,7 +88,10 @@ char **tokeniseOperands(char *line, int *numTokens) {
         if (*c == ',' && !inBracket) {
             *c = '\0';
             tokens[(*numTokens)++] = currentToken;
-            currentToken = c + 2; // Skip ", "
+            currentToken = c + 1;
+            while (*currentToken == ' ') {
+                currentToken++;
+            }
         }
     }