fix pkg, wip