Fix Path issue