Fix for #2875