indexing issues fixed