Fix circular dependence