FIX R16 and R17 compatibility enabled (now for real)