AMEC-1848, changed the padding