Fixed find-by-values bug