removed dependency loop