Fix for #1864