Fixed path analysis
Merge pull request #2294 from hason/path

Fixed path analysis