yet another dep cycle fix attempt