7 fix circular deps