Fix broken field indexes by #4