Possible fix for issue #639