Fix for directory containing non-ascii chars