fixed issue with finders