diff --git a/src/iec61850/server/impl/client_connection.c b/src/iec61850/server/impl/client_connection.c
index a4925581..bea9f136 100644
--- a/src/iec61850/server/impl/client_connection.c
+++ b/src/iec61850/server/impl/client_connection.c
@@ -125,7 +125,7 @@ ClientConnection_getPeerAddress(ClientConnection self)
 {
     MmsServerConnection mmsConnection = (MmsServerConnection) self->serverConnectionHandle;
 
-    return IsoConnection_getPeerAddress(MmsServerConnection_getIsoConnection(mmsConnection));
+    return MmsServerConnection_getClientAddress(mmsConnection);
 }
 
 
@@ -134,5 +134,5 @@ ClientConnection_getSecurityToken(ClientConnection self)
 {
     MmsServerConnection mmsConnection = (MmsServerConnection) self->serverConnectionHandle;
 
-    return IsoConnection_getSecurityToken(MmsServerConnection_getIsoConnection(mmsConnection));
+    return MmsServerConnection_getSecurityToken(mmsConnection);
 }
diff --git a/src/mms/inc/mms_server.h b/src/mms/inc/mms_server.h
index 18462503..9b946b6c 100644
--- a/src/mms/inc/mms_server.h
+++ b/src/mms/inc/mms_server.h
@@ -34,7 +34,7 @@ extern "C" {
 
 #include "mms_device_model.h"
 #include "mms_value.h"
-#include "iso_server.h"
+#include "iso_connection_parameters.h"
 
 typedef enum {
 	MMS_SERVER_NEW_CONNECTION, MMS_SERVER_CONNECTION_CLOSED
@@ -507,9 +507,8 @@ MmsServer_setStatusRequestListener(MmsServer self, MmsStatusRequestListener list
 LIB61850_INTERNAL char*
 MmsServerConnection_getClientAddress(MmsServerConnection self);
 
-LIB61850_INTERNAL IsoConnection
-MmsServerConnection_getIsoConnection(MmsServerConnection self);
-
+LIB61850_INTERNAL void*
+MmsServerConnection_getSecurityToken(MmsServerConnection self);
 
 /**@}*/
 
diff --git a/src/mms/iso_mms/server/mms_server_connection.c b/src/mms/iso_mms/server/mms_server_connection.c
index 0dc9be75..448d9a98 100644
--- a/src/mms/iso_mms/server/mms_server_connection.c
+++ b/src/mms/iso_mms/server/mms_server_connection.c
@@ -787,10 +787,10 @@ MmsServerConnection_getClientAddress(MmsServerConnection self)
     return IsoConnection_getPeerAddress(self->isoConnection);
 }
 
-IsoConnection
-MmsServerConnection_getIsoConnection(MmsServerConnection self)
+void*
+MmsServerConnection_getSecurityToken(MmsServerConnection self)
 {
-    return self->isoConnection;
+    return IsoConnection_getSecurityToken(self->isoConnection);
 }
 
 #if (MMS_DYNAMIC_DATA_SETS == 1)