Possible fix for #1159.