Fix for #2695