Fixed cyclic dependency problem.