Fix padding *CORRECTLY* this time...