Fixed a circular dependency