Fix for #409
PKG