fix circular dep.