diff --git a/CUETools.Processor/CUEMetadata.cs b/CUETools.Processor/CUEMetadata.cs
index da3dd6e..2917e5b 100644
--- a/CUETools.Processor/CUEMetadata.cs
+++ b/CUETools.Processor/CUEMetadata.cs
@@ -275,8 +275,8 @@ namespace CUETools.Processor
 			this.DiscName = cdEntry.discname ?? "";
             this.Comment = cdEntry.extra ?? "";
 			this.Barcode = cdEntry.barcode ?? "";
-			this.ReleaseDate = cdEntry.releasedate ?? "";
-			this.Country = cdEntry.country ?? "";
+			this.ReleaseDate = (cdEntry.release == null || cdEntry.release.Length == 0 ? null : cdEntry.release[0].date) ?? "";
+            this.Country = (cdEntry.release == null || cdEntry.release.Length == 0 ? null : cdEntry.release[0].country) ?? "";
 			this.Genre = cdEntry.genre ?? "";
 			this.Label = "";
             this.LabelNo = "";