Possible fix for #1628