Even more correct handling of padding.