Another padding fix