fix finder logic