fix side effect of I-121698 fix