Circular dependecy fix