Fix issue with wrong package for common entries