Possible fix for #639