Fix for adding "Indexes" twice