Fixed path related bug