Package detection fix (#1574)
Merge pull request #1576 from glebm/patch-1

Package detection fix (#1574)