Using elastica fork to fix indexing issue