diff --git a/Elwig/Helpers/Export/Ebics.cs b/Elwig/Helpers/Export/Ebics.cs
index 3d7129e..0ce57dd 100644
--- a/Elwig/Helpers/Export/Ebics.cs
+++ b/Elwig/Helpers/Export/Ebics.cs
@@ -86,10 +86,11 @@ namespace Elwig.Helpers.Export {
                     var full = ShowAddresses == AddressMode.Full;
                     await Writer.WriteLineAsync($"""
                              <PstlAdr>
+                              {(full ? "" : $"<Ctry>{a.PostalDest.Country.Alpha2}</Ctry>")}
                               {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" :
                                        $"<AdrLine>{SecurityElement.Escape(a.Address[..Math.Min(70, a.Address.Length)])}</AdrLine>")}
                               <{(full ? "PstCd" : "AdrLine")}>{a.PostalDest.AtPlz?.Plz}{(full ? "</PstCd> <TwnNm>" : " ")}{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</{(full ? "TwnNm" : "AdrLine")}>
-                              <{(full ? "" : "!--")}Ctry>{a.PostalDest.Country.Alpha2}</Ctry{(full ? "" : "--")}>
+                              {(full ? $"<Ctry>{a.PostalDest.Country.Alpha2}</Ctry>" : "")}
                              </PstlAdr>
                         """);
                 }