fix circular dependency
Fixed Circular Dependancy