Tweak find implementation