Updated for wordwrapper fix.