Merge pull request #8408 from AdamHillier/bug-fix