Additional fix for #1871