Split -packages, fixing related issue