Fixed fake circular dependency issue.