Fix for #2214.