Index cs fix