possible fix for #1467