Enforce optimal index

It makes sense, thanks!