possible fix for #1909