Work on #332
PKG