Fixed package dependency cycle