FIXED circular dependency.