Minor fix for indexes