Fix for #1900