diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index df32cfdb67..9120aa2f75 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -788,7 +788,6 @@ static int ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
                                         profile_value ) );
             MBEDTLS_PUT_UINT16_BE( profile_value, p, 0 );
             p += 2;
-
         }
         else
         {
@@ -1321,8 +1320,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
         /* No need to check for space here, because the extension
          * writing functions already took care of that. */
         MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
-        p += 2;
-        p += ext_len;
+        p += 2 + ext_len;
     }
 
     ssl->out_msglen  = p - buf;
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 1841b55790..b8c4314846 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2638,8 +2638,7 @@ static int ssl_write_server_hello( mbedtls_ssl_context *ssl )
     if( ext_len > 0 )
     {
         MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
-        p += 2;
-        p += ext_len;
+        p += 2 + ext_len;
     }
 
     ssl->out_msglen  = p - buf;