Path resolving fix