Correct Padding issues