Fix dependency loop