Make compatible with R17