Internals box fix.
Merge pull request #3507 from Segrain/master

Internals for everyone.