[DF-185] Fixed resolving of pathnames