[REF] Small fix and Add compatibility with 6.1