Revert "Revert "improve retrocompatibility""

This reverts commit b49a72f8bd8bef1848d824b98344f92b02be8e55.