fixed cyclic dependency issue