Fixed bugs with path