Re-add code to make index statements unique