Enforce optimal index

This change would lead to suboptimal choices unfortunately. I relaxed the conditions.