Also fix padding