possible fix for #1741