Quick fix to remove data index