diff --git a/ssl/handshake_client.c b/ssl/handshake_client.c
index 09f4d4f..229cf1a 100644
--- a/ssl/handshake_client.c
+++ b/ssl/handshake_client.c
@@ -364,13 +364,11 @@
         } else {
           skip = 1;
         }
-        ssl->state = SSL3_ST_CW_CHANGE_A;
+        ssl->state = SSL3_ST_CW_CHANGE;
         break;
 
-      case SSL3_ST_CW_CHANGE_A:
-      case SSL3_ST_CW_CHANGE_B:
-        ret = ssl->method->send_change_cipher_spec(ssl, SSL3_ST_CW_CHANGE_A,
-                                                   SSL3_ST_CW_CHANGE_B);
+      case SSL3_ST_CW_CHANGE:
+        ret = ssl->method->send_change_cipher_spec(ssl);
         if (ret <= 0) {
           goto end;
         }
@@ -483,7 +481,7 @@
         ssl->method->received_flight(ssl);
 
         if (ssl->hit) {
-          ssl->state = SSL3_ST_CW_CHANGE_A;
+          ssl->state = SSL3_ST_CW_CHANGE;
         } else {
           ssl->state = SSL_ST_OK;
         }