Fixing a dependency loop