Fix for issue #6868
Fix for issue #6868