Fix for #2680