Fix for the second time the bug with the index