Full compat 3.8/3.10