remove weird circular dependency