[3.8] Fix #1494 zero indexed field list