Possible fix for #391