diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 59bfbde6..40a049d3 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -89,10 +89,10 @@ namespace WebSocketSharp.Net
     internal EndPointListener (
       IPAddress address,
       int port,
+      bool reuseAddress,
       bool secure,
       string certificateFolderPath,
-      ServerSslConfiguration sslConfig,
-      bool reuseAddress)
+      ServerSslConfiguration sslConfig)
     {
       if (secure) {
         var cert = getCertificate (port, certificateFolderPath, sslConfig.ServerCertificate);
@@ -105,7 +105,6 @@ namespace WebSocketSharp.Net
       }
 
       _prefixes = new Dictionary<HttpListenerPrefix, HttpListener> ();
-
       _unregistered = new Dictionary<HttpConnection, HttpConnection> ();
       _unregisteredSync = ((ICollection) _unregistered).SyncRoot;
 
diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs
index c727d650..9a82e876 100644
--- a/websocket-sharp/Net/EndPointManager.cs
+++ b/websocket-sharp/Net/EndPointManager.cs
@@ -132,10 +132,10 @@ namespace WebSocketSharp.Net
         lsnr = new EndPointListener (
           addr,
           port,
+          listener.ReuseAddress,
           secure,
           listener.CertificateFolderPath,
-          listener.SslConfiguration,
-          listener.ReuseAddress);
+          listener.SslConfiguration);
 
         eps[port] = lsnr;
       }