diff --git a/lib/marked.js b/lib/marked.js
index 6917bd4f..d524db17 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -17,7 +17,7 @@ var block = {
   heading: /^ *(#{1,6}) *([^\0]+?) *#* *\n+/,
   lheading: /^([^\n]+)\n *(=|-){3,}/,
   blockquote: /^(^ *> ?[^\n]+\n([^\n]+\n)*\n*)+/,
-  list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/,
+  list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1(?:[*+-](?! *\* *\*)|\d+\.))/,
   html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
   paragraph: /^([^\n]+\n?(?!body))+\n*/,
   text: /^[^\n]+/
@@ -202,7 +202,7 @@ block.token = function(str, tokens, top) {
 
       // Get each top-level item.
       cap = cap[0].match(
-        /^( *)([*+-]|\d+\.)[^\n]*(?:\n(?!\1\2|\1\d+\.)[^\n]*)*/gm
+        /^( *)([*+-]|\d+\.)[^\n]*(?:\n(?!\1(?:[*+-]|\d+\.))[^\n]*)*/gm
       );
 
       i = 0;