diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 7bbcc85..c1cd01a 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -866,6 +866,8 @@ to get illegal syntax when uncommenting them.
     - added support for spectre, thx to Brett Warneke
     - fixed a bug that was screwing up the removal of spaces when
       NERDSpaceDelims was set. Thx to David Miani for posting the issue.
+    - fixed a bug with aligned comments and the NERDSpaceDelims option, thx to
+      Jeremy Hinegardner
     - added dummy support for lhaskell, thx to pipp for posting the issue
     
 
@@ -1135,6 +1137,9 @@ Cheers to Yongwei Wu for a bug report about the passwd filetype.
 Thanks to David Miani for reporting a space-removal bug when using the
 NERDSpaceDelims option.
 
+Thanks to Jeremy Hinegardner for emailing me about a bug with aligned
+comments and the NERDSpaceDelims option.
+
 Not to forget! Thanks to the following people for sending me new filetypes to
 support :D
 
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 33389b8..3f95859 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -1106,12 +1106,12 @@ function s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine)
             " check if we can comment this line 
             if !isCommented || g:NERDUsePlaceHolders || s:Multipart()
                 if a:alignLeft
-                    let theLine = s:AddLeftDelimAligned(b:left, theLine, leftAlignIndx)
+                    let theLine = s:AddLeftDelimAligned(s:GetLeft(0,1,0), theLine, leftAlignIndx)
                 else
                     let theLine = s:AddLeftDelim(s:GetLeft(0,1,0), theLine)
                 endif
                 if a:alignRight
-                    let theLine = s:AddRightDelimAligned(b:right, theLine, rightAlignIndx)
+                    let theLine = s:AddRightDelimAligned(s:GetRight(0,1,0), theLine, rightAlignIndx)
                 else
                     let theLine = s:AddRightDelim(s:GetRight(0,1,0), theLine)
                 endif