Fixes issuer-country handling