Resolve an index bug