possible fix for #1830