Fix for #1910