Attempt to fix indexing issues