Fix FIND method