Wordwrap issue fix