Fixing bugs in find()