Fixed padding issues in #2003.
Merge pull request #2004 from pjackson28/master

Fixed padding issues in #2003