Possible fix for #1719?