Fixed wordwrap issues