Quick fix for #940