Fixed weird circular dependency issue.