fixing index with D#