diff --git a/ChangeLog b/ChangeLog
index 36214305a3..b3a0a4ef44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-14  Wim Taymans  <wim@fluendo.com>
+
+	* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_open):
+	Less uglyness..
+
 2006-08-14  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_submit_buffer),
diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c
index 1fb275e56b..a7d7798d18 100644
--- a/ext/alsa/gstalsamixer.c
+++ b/ext/alsa/gstalsamixer.c
@@ -93,8 +93,8 @@ gst_alsa_mixer_open (GstAlsaMixer * mixer)
   GST_DEBUG ("Card name = %s", GST_STR_NULL (mixer->cardname));
   snd_ctl_close (ctl);
 
-  if (FALSE) {
-  no_card_name:
+no_card_name:
+  if (mixer->cardname == NULL) {
     mixer->cardname = g_strdup ("Unknown");
     GST_DEBUG ("Cannot find card name");
   }