Fix: dependency circle