Fixed subpath issue