hotfix for branchless imports