diff --git a/docs b/docs
deleted file mode 160000
index e28425c..0000000
--- a/docs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e28425ce02d60f0ecf42ab1b622a27474cdb0a61
diff --git a/zencoding.vim b/zencoding.vim
index f32f096..179f0b4 100644
--- a/zencoding.vim
+++ b/zencoding.vim
@@ -1633,6 +1633,10 @@ function! s:zen_toggleComment()
         let pos2 = searchpos('</' . tag_name . '>', 'cneW')
       endif
       let block = [pos1, pos2]
+      if !s:region_is_valid(block)
+        call setpos('.', curpos)
+        let block = s:search_region('<!', '-->')
+      endif
       if s:point_in_region(curpos[1:2], block)
         let comment_region = s:search_region('<!--', '-->')
         if !s:region_is_valid(comment_region) || !s:point_in_region(curpos[1:2], comment_region)