2_10_7_patch1
tentative fix for #1157