Fixed bug with circular dependency.