Correct padding issue