Fix definition and add padding.