diff --git a/build.gradle b/build.gradle
index 6ddb9dc1..77ed0948 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,3 +111,15 @@ runtime {
     modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
     imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip")
 }
+
+task buildSdr(type: Jar) {
+    manifest {
+        attributes 'Implementation-Title': 'SdrTrunk project',
+                'Implementation-Version': version,
+                'Main-Class': 'io.github.dsheirer.gui.SDRTrunk',
+                'Class-Path': 'jmbe-0.3.2.jar jmbe-0.3.3.jar'
+    }
+    baseName = project.name + '-all'
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
diff --git a/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java b/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java
index da1807a7..514f8aab 100644
--- a/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/playback/AudioChannelPanel.java
@@ -1,7 +1,7 @@
 /*
  * ******************************************************************************
  * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
+ * Copyright (C) 2014-2019 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -238,6 +238,11 @@ public class AudioChannelPanel extends JPanel implements Listener<AudioEvent>, S
             identifier = Joiner.on(", ").skipNulls().join(mAliases);
         }
 
+        if(identifier == null && mIdentifier != null)
+        {
+            identifier = mTalkgroupFormatPreference.format(mIdentifier);
+        }
+
         if(identifier == null)
         {
             identifier = "-----";