Prevent code overflowing container
Merge pull request #2429 from jshawl/code-overflow-fix