Added a fix for new packages