Bug Fixed.

Working on secondary index.