Possible fix for #1349