Possible fix for #727