diff --git a/plugin/commentary.vim b/plugin/commentary.vim
index 5370106..8bdae4a 100644
--- a/plugin/commentary.vim
+++ b/plugin/commentary.vim
@@ -54,13 +54,13 @@ function! s:go(...) abort
   let lines = []
   for lnum in range(lnum1,lnum2)
     let line = getline(lnum)
-    if strlen(r) > 2 && l.r !~# '\\'
+    if strlen(r) > 2 && l.r !~# '\\' && !force_uncomment
       let line = substitute(line,
             \'\M' . substitute(l, '\ze\S\s*$', '\\zs\\d\\*\\ze', '') . '\|' . substitute(r, '\S\zs', '\\zs\\d\\*\\ze', ''),
             \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g')
     endif
     if force_uncomment
-      if line =~ '^\s*' . l
+      if line =~ '\v\C^\s*' . escape(l, '!#$%&()*+,-./:;<=>?@[\]^{|}~')
         let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
       endif
     elseif uncomment