Put @arty-name's fix back in

Still just testing - and ensuring the fix is solid across platforms.

TODO: revert *back in* the mac find changes