Fix last field padding, fixes #5722