merge in fix of word wrap