Fix for issue #6868