Proper field index handling