Possible fix for #1377