Resolved circular dep error