Resolved circular dep