Merge pull request #6900 from annando/fix-error