Fixed find all bug