diff --git a/src/endpoint.hpp b/src/endpoint.hpp
index 99bee8f34c..108dac1bf0 100644
--- a/src/endpoint.hpp
+++ b/src/endpoint.hpp
@@ -46,7 +46,7 @@ namespace websocketpp {
 class endpoint_base {
 protected:
     /// Start the run method of the endpoint's io_service object.
-    void run() {
+    void run_internal() {
         m_io_service.run();
     }
     
diff --git a/src/roles/server.hpp b/src/roles/server.hpp
index 0d3197b4a0..a67151bc38 100644
--- a/src/roles/server.hpp
+++ b/src/roles/server.hpp
@@ -220,7 +220,7 @@ void server<endpoint>::listen(uint16_t port) {
     
     m_ws_endpoint.alog().at(log::alevel::DEVEL) << "role::server listening on port " << port << log::endl;
     
-    m_ws_endpoint.run();
+    m_ws_endpoint.run_internal();
 }
 
 template <class endpoint>