Fix for #1911