Be consistent with index vars