Another tweak to index generator