Fix of R17