Compatibility with versions <R16