which should only find files, not directories
Merge branch 'fix/which'