Fix for #1810