Fixed another bug related to overflowing contents (#459)
Merge remote-tracking branch 'origin/develop' into develop