Fixed dependency loop