diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/Generator.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/Generator.java
index 5f86628839b..42e34350086 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/Generator.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/Generator.java
@@ -55,11 +55,15 @@ public class Generator
     {
         if (LOG.isDebugEnabled())
         {
-            LOG.debug("Buffer: {}",BufferUtil.toDetailString(buffer));
+            LOG.debug("To Generate: {}",frame);
         }
         FrameGenerator generator = generators.get(frame.getOpCode());
-        LOG.debug(generator.getClass().getSimpleName() + " active");
-        return generator.generate(buffer,frame);
+        ByteBuffer ret = generator.generate(buffer,frame);
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Generated[{}]: {}",generator.getClass().getSimpleName(),BufferUtil.toDetailString(buffer));
+        }
+        return ret;
     }
 
     @Override