Possible fix for #655