Fix #4637 Field Alignment

Marc, I let you check and merge, this time…