Revert "Fix Index"

This reverts commit 9e13b8a0018d4ce1452e3af7b138b88a3fec67cf.
Fix Index