Fix cyclic dependency