Fixed resolving long file names