oops, fix cyclic dep