fix indexed finder