Enforce optimal index

You are correct