Fixed bug in finders