Padding adjustment for issue #1363