diff --git a/CommonMark.Tests/ListTests.cs b/CommonMark.Tests/ListTests.cs
index 14d82f0..6c55436 100644
--- a/CommonMark.Tests/ListTests.cs
+++ b/CommonMark.Tests/ListTests.cs
@@ -39,6 +39,13 @@ public void ListWithTabs()
             Helpers.ExecuteTest("*\tbar", "<ul>\n<li>bar</li>\n</ul>");
         }
 
+        [TestMethod]
+        [TestCategory("Container blocks - List items")]
+        public void ListWithTabs2()
+        {
+            Helpers.ExecuteTest("* foo\n\t* i1\n\t* i2", "<ul>\n<li>foo\n<ul>\n<li>i1</li>\n<li>i2</li>\n</ul>\n</li>\n</ul>");
+        }
+
         [TestMethod]
         [TestCategory("Container blocks - List items")]
         public void UnicodeBulletEscape()
diff --git a/CommonMark/Parser/BlockMethods.cs b/CommonMark/Parser/BlockMethods.cs
index b934011..52360ed 100644
--- a/CommonMark/Parser/BlockMethods.cs
+++ b/CommonMark/Parser/BlockMethods.cs
@@ -637,7 +637,7 @@ public static void IncorporateLine(LineInfo line, ref Block curptr)
 
                 FindFirstNonspace(ln, offset, column, out first_nonspace, out first_nonspace_column, out curChar);
 
-                indent = first_nonspace_column - column;
+                indent = first_nonspace_column - column + remainingSpaces;
                 blank = curChar == '\n';
 
                 var indented = indent >= CODE_INDENT;