fixed find method