Fix minimum number of expected fields