possible fix for #1050