diff --git a/websocket-sharp/Net/HttpUtility.cs b/websocket-sharp/Net/HttpUtility.cs
index e23ad343..8fa75feb 100644
--- a/websocket-sharp/Net/HttpUtility.cs
+++ b/websocket-sharp/Net/HttpUtility.cs
@@ -293,10 +293,12 @@ namespace WebSocketSharp.Net
         }
       }
 
-      if (entity.Length > 0)
+      if (entity.Length > 0) {
         buff.Append (entity.ToString ());
-      else if (haveTrailingDigits)
-        buff.Append (number.ToString (CultureInfo.InvariantCulture));
+
+        if (haveTrailingDigits)
+          buff.Append (number.ToString (CultureInfo.InvariantCulture));
+      }
 
       return buff.ToString ();
     }