Revert "Fix similar error"

This reverts commit 6bfb33b0d98244103c954dbe4b947f34c4c6aae6.
Revert "Fix error on index"

This reverts commit ff988a8d33e97a939e13812a0e1e93e70815639e.