Revert "Avoid index reset error in case of unexistant index"

This reverts commit a121a777743525f46c65dc29d983c8eb92720664.