fix cyclic deps