Worked out circular dependency problem.