Possible fix for #1177