complementary fix for #7115
2 files changed