Fixed broken circular dep on settings