diff --git a/plugin/commentary.vim b/plugin/commentary.vim
index 5b548cf..54d4a3e 100644
--- a/plugin/commentary.vim
+++ b/plugin/commentary.vim
@@ -30,7 +30,7 @@ function! s:go(type)
     if uncomment
       let line = substitute(getline(lnum),'\S.*\s\@<!','\=submatch(0)[strlen(before):-strlen(after)-1]','')
     else
-      let line = substitute(getline(lnum),'^\%('.matchstr(getline(lnum1),'^\s*').'\|\s*\)\zs.*\s\@<!','\=before.submatch(0).after','')
+      let line = substitute(getline(lnum),'^\%('.matchstr(getline(lnum1),'^\s*').'\|\s*\)\zs.*\S\@<=','\=before.submatch(0).after','')
     endif
     call setline(lnum,line)
   endfor