diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c
index 16ee5e10d..b2cd27986 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c
@@ -869,16 +869,12 @@ static void prvServerWorkTask( void * pvArgument )
     struct tm * gmtime_r( const time_t * pxTime,
                           struct tm * tmStruct )
     {
-        struct tm tm;
-
-        memcpy( &( tm ), gmtime( pxTime ), sizeof( tm ) );
-
         if( tmStruct != NULL )
         {
-            memcpy( tmStruct, &( tm ), sizeof tm );
+            memcpy( tmStruct, gmtime( pxTime ), sizeof( struct tm ) );
         }
 
-        return &( tm );
+        return tmStruct;
     }
 /*-----------------------------------------------------------*/