possible fix for #1271