Fixed path issue, closes #358