Better fix for #6836