Possible fix for #1501