diff --git a/km3buu/output.py b/km3buu/output.py
index afac4fe8c737c2fbd49c470210c664e63a907766..9e34538acd7e831fbe24d28979c7155b0f15172a 100644
--- a/km3buu/output.py
+++ b/km3buu/output.py
@@ -536,11 +536,19 @@ class GiBUUOutput:
 
     @property
     def A(self):
-        return self.jobcard["target"]["a"]
+        grp = self.jobcard["target"]
+        if "a" in grp.keys():
+            return grp["a"]
+        elif "target_a" in grp.keys():
+            return grp["target_a"]
 
     @property
     def Z(self):
-        return self.jobcard["target"]["z"]
+        grp = self.jobcard["target"]
+        if "z" in grp.keys():
+            return grp["z"]
+        elif "target_z" in grp.keys():
+            return grp["target_z"]
 
     @property
     def data_path(self):