Patch 2

fix for issue #10371 (and #10395)