Potential overflow fix on content