fixed cyclic t/ deps