Include country in letter envelopes for international mailings

I really appreciate the new "Envelopes" option that creates a pdf of addressed envelopes for our thank you letters. Unfortunately the country name is not being pulled into the address for international addresses. It would be great if you could fix this before I have to send hundreds of thank you letters in December. I've attached a pdf file that shows what my international addresses look like now.