fixed cyclic dependency