Fixed dep cycle.