circular dependency fix.