DAR-2629 | Don't ignore padding