Fixed issues with word wrap