[REF] compatibility with 6.1