diff --git a/rabbitmq_messages_uncommitted b/rabbitmq_messages_uncommitted
index b2869d1..349bcd9 100755
--- a/rabbitmq_messages_uncommitted
+++ b/rabbitmq_messages_uncommitted
@@ -70,4 +70,4 @@ fi
 # real work - i.e. display the data. Almost always this will be
 # "value" subfield for every data field.
 
-HOME=$HOME rabbitmqctl list_channels -p $VHOST name messages_uncommitted | grep -v "^Listing" | grep -v "done.$" | sed "s/[\t]/.value /g"
+HOME=$HOME rabbitmqctl list_channels name vhost messages_uncommitted | grep -v "\.\.\." | grep $VHOST | sed "s/[ ]->.*[\t]/.value /g"