Fix wrapping or too small problem.
Another rc.