diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index 91a9e044d..fd8cea73d 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -35,8 +35,8 @@ describe "Snippets extension", ->
           "tab stops":
             prefix: "t2"
             body: """
-              go here next:($1) and finally go here:($2)
-              go here first:($0)
+              go here next:($2) and finally go here:($0)
+              go here first:($1)
 
             """
 
diff --git a/src/packages/snippets/src/snippet.coffee b/src/packages/snippets/src/snippet.coffee
index 51e2e7c5f..ef7c3d0aa 100644
--- a/src/packages/snippets/src/snippet.coffee
+++ b/src/packages/snippets/src/snippet.coffee
@@ -22,6 +22,7 @@ class Snippet
       for segment in bodyTree
         if segment.index?
           { index, content } = segment
+          index = Infinity if index == 0
           start = [row, column]
           extractTabStops(content)
           tabStopsByIndex[index] = new Range(start, [row, column])