fix for #1070 and #1067 will be a 2_10_4_patch2