Attempting to fix indexing issues