Fixing an issue with circular dependencies.