Fixed find method