Fixed padding issues in #2003