Fix for #4175