Fix an issue with the index design