fix Circular dependencies