fixed subpath issue