Revert Find Issue 1