fix some package logic
Merge branch 'hotfix/2.0.1'