Quick fix for #2659.