Refix on pkgpath split