Revert "Removed the bug with the index number"

This reverts commit 34836648dc180a0a107833d0c70e616eca364cd7.