those 2 can be moved to PKG_CHECK as well