fix for #7837