Fix path escape problem