r222 fix