Fix for #1933