indexes-keys bug fixed