Fixed cyclic dependency