Fix package-as