R17 compatibility