diff --git a/src/expand.cpp b/src/expand.cpp
index ed6532202..97ed27dc3 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -260,6 +260,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
         }
 
         // debug( 0, L"Push idx %d", tmp );
+        literal_zero_index = literal_zero_index && tmp == 0;
         idx.push_back(i1);
         source_positions.push_back(i1_src_pos);
     }
diff --git a/tests/zero_based_array.in b/tests/zero_based_array.in
index 5eb57a66b..4dc28ec1f 100644
--- a/tests/zero_based_array.in
+++ b/tests/zero_based_array.in
@@ -1,3 +1,8 @@
 echo $foo[0]
 echo $foo[ 0 ]
 echo $foo[ 00 ]
+
+# and make sure these didn't break
+set -l foo one two three
+echo $foo[001]
+
diff --git a/tests/zero_based_array.out b/tests/zero_based_array.out
index e69de29bb..5626abf0f 100644
--- a/tests/zero_based_array.out
+++ b/tests/zero_based_array.out
@@ -0,0 +1 @@
+one