Fix for #2911.