fix dependency loop