Possible fix for issue #818