Fixed dependency circle.