possible fix for #1981