fix issue with circular dependency