Issue 6810

These changes should fix the issue.