Fix word wrap

merge in word wrap fix