diff --git a/testssl.sh b/testssl.sh
index 917fc2a..ededdc8 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -22965,12 +22965,37 @@ nodeip_to_proper_ip6() {
 
 
 reset_hostdepended_vars() {
+     NR_SOCKET_FAIL=0
+     NR_OSSL_FAIL=0
+     NR_STARTTLS_FAIL=0
+     NR_HEADER_FAIL=0
      TLS_EXTENSIONS=""
      PROTOS_OFFERED=""
+     TLS12_CIPHER_OFFERED=""
      CURVES_OFFERED=""
+     KNOWN_OSSL_PROB=false
+     TLS13_ONLY=false
+     CLIENT_AUTH="none"
+     NO_SSL_SESSIONID=false
+     DH_GROUP_OFFERED=""
+     DH_GROUP_LEN_P=0
+     KEY_SHARE_EXTN_NR="33"
+     BAD_SERVER_HELLO_CIPHER=false
+     GOST_STATUS_PROBLEM=false
      OPTIMAL_PROTO=""
+     STARTTLS_OPTIMAL_PROTO=""
      ALL_FAILED_SOCKETS=true
      SERVER_SIZE_LIMIT_BUG=false
+     SERVICE=""
+     CERT_FINGERPRINT_SHA2=""
+     RSA_CERT_FINGERPRINT_SHA2=""
+     TLS_TIME=""
+     GRADE_CAP=""
+     GRADE_CAP_REASONS=()
+     GRADE_WARNINGS=()
+     KEY_EXCH_SCORE=100
+     CIPH_STR_BEST=0
+     CIPH_STR_WORST=100000
 }
 
 # Rough estimate, in the future we maybe want to make use of nano secs (%N). Note this
@@ -23131,10 +23156,6 @@ lets_roll() {
      calc_scantime
      datebanner " Done"
 
-     # reset the failed connect counter as we are finished
-     NR_SOCKET_FAIL=0
-     NR_OSSL_FAIL=0
-
      "$MEASURE_TIME" && printf "$1: %${COLUMNS}s\n" "$SCAN_TIME"
      [[ -e "$MEASURE_TIME_FILE" ]] && echo "Total : $SCAN_TIME " >> "$MEASURE_TIME_FILE"