Fixed use of numeric country codes