Allow compilation with R16