[FIX] Fixed handling of paths containing special chars or apostrophes etc.