Fixed find logic