Fix zero-padding properly this time.