Fix #5986 - Override default field order