Fix the escaped paths problem