possible fix for #1795