Handle padding well
Merge branch 'hotfix/1.1.2'