Potential fix for #6162