fix #21964
fix regression tests!