diff --git a/commonmark/parser.scm b/commonmark/parser.scm
index 678b4c5..d8cd8bd 100644
--- a/commonmark/parser.scm
+++ b/commonmark/parser.scm
@@ -1,4 +1,4 @@
-;; Copyright (C) 2016 Erik Edrosa <erik.edrosa@gmail.com>
+;; Copyright (C) 2016, 2017  Erik Edrosa <erik.edrosa@gmail.com>
 ;;
 ;; This file is part of guile-commonmark
 ;;
@@ -202,7 +202,7 @@
   (regexp-exec re-fenced-code (parser-str parser) (parser-pos parser)))
 
 (define (fenced-code-end parser fence)
-  (string-match (string-append "^" fence "$") (parser-str parser) (parser-pos parser)))
+  (string-match (string-append "^" fence "+$") (parser-str parser) (parser-pos parser)))
 
 (define (bullet-list-marker parser)
   (regexp-exec re-bullet-list-marker (parser-str parser) (parser-pos parser)))
diff --git a/tests/blocks/fenced-code.scm b/tests/blocks/fenced-code.scm
index 1377136..c093600 100644
--- a/tests/blocks/fenced-code.scm
+++ b/tests/blocks/fenced-code.scm
@@ -57,7 +57,6 @@ aaa
   ('document _
              ('fenced-code _ "aaa\n```")))
 
-(test-expect-fail 1) ;; TODO match longer closing fences
 (block-expect "parse-blocks, fenced code closing fence must be at least as long as
 the opening fence"
   "````
@@ -65,7 +64,7 @@ aaa
 ```
 ``````"
   ('document _
-             ('frenced-code _ "aaa\n```")))
+             ('fenced-code _ "aaa\n```")))
 
 (block-expect "parse-blocks, fenced code closing fence must be at least as long as
 the opening fence"