Merge pull request #7147 from annando/fix-structure