fix path encoding issue
re-factor method name