us#32380 fix