Fix coding for R17