diff --git a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
index 862bf538d6..79569d3052 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -479,6 +479,7 @@ public abstract class AbstractTrafficShapingHandler extends
         if (timeout != null) {
             timeout.cancel();
         }
+        timer.stop();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
index 0af078caaa..0ac0bc72c5 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -51,7 +51,7 @@ import org.jboss.netty.util.Timer;
  * {@link OrderedMemoryAwareThreadPoolExecutor} or {@link MemoryAwareThreadPoolExecutor}).<br>
  * <tt>pipeline.addLast("GLOBAL_TRAFFIC_SHAPING", myHandler);</tt><br><br>
  * </li>
- * <li>When you shutdown your application, release all the external resources (except the timer internal itself)
+ * <li>When you shutdown your application, release all the external resources
  * by calling:<br>
  * <tt>myHandler.releaseExternalResources();</tt><br>
  * </li>