Fixed index creation