diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs
index ef69575..26fb3c4 100644
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -128,7 +128,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -139,7 +139,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;