diff --git a/rabbitmq-consumers b/rabbitmq-consumers
index f190192..1ac8dfe 100755
--- a/rabbitmq-consumers
+++ b/rabbitmq-consumers
@@ -31,7 +31,7 @@ fi
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/\./_/g' )
+		grep -v 'done\.$' | sed -e 's/[.-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-100}
@@ -71,4 +71,4 @@ fi
 
 rabbitmqctl list_queues -p $VHOST name consumers| \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages b/rabbitmq-messages
index f951eeb..8091d73 100755
--- a/rabbitmq-messages
+++ b/rabbitmq-messages
@@ -31,7 +31,7 @@ fi
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/\./_/g')
+		grep -v 'done\.$' | sed -e 's/[.-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -71,4 +71,4 @@ fi
 
 rabbitmqctl list_queues -p $VHOST | \
 	grep -v "^Listing" | grep -v "done.$" | \
-	perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")'
+	perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages_unacknowledged b/rabbitmq-messages_unacknowledged
index 5d8b637..c56edd1 100755
--- a/rabbitmq-messages_unacknowledged
+++ b/rabbitmq-messages_unacknowledged
@@ -31,7 +31,7 @@ fi
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$')
+		grep -v 'done\.$' | sed -e 's/[.-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -71,4 +71,4 @@ fi
 
 rabbitmqctl list_queues -p $VHOST name messages_unacknowledged | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-messages_uncommitted b/rabbitmq-messages_uncommitted
index d6d6c9e..8bb3aef 100755
--- a/rabbitmq-messages_uncommitted
+++ b/rabbitmq-messages_uncommitted
@@ -31,7 +31,7 @@ fi
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$')
+		grep -v 'done\.$' | sed -e 's/[.-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -71,4 +71,4 @@ fi
 
 rabbitmqctl list_queues -p $VHOST name messages_uncommitted | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'
diff --git a/rabbitmq-queue_memory b/rabbitmq-queue_memory
index aa75a4c..1bb46dc 100755
--- a/rabbitmq-queue_memory
+++ b/rabbitmq-queue_memory
@@ -31,7 +31,7 @@ fi
 VHOST=${vhost:-"/"}
 QUEUES=$(rabbitmqctl list_queues -p $VHOST name | \
 		grep -v '^Listing' | \
-		grep -v 'done\.$' | sed -e 's/\./_/g')
+		grep -v 'done\.$' | sed -e 's/[.-]/_/g' )
  
 if [ "$1" = "config" ]; then
         QUEUE_WARN=${queue_warn:-10000}
@@ -71,4 +71,4 @@ fi
 
 rabbitmqctl list_queues -p $VHOST name memory | \
 	grep -v "^Listing" | grep -v "done.$" | \
-    perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")'
+    perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'