diff --git a/src/hss/hss_fd_path.c b/src/hss/hss_fd_path.c
index 670329386..75fb2e6b6 100644
--- a/src/hss/hss_fd_path.c
+++ b/src/hss/hss_fd_path.c
@@ -98,8 +98,7 @@ static int hss_s6a_air_cb( struct msg **msg, struct avp *avp,
         if (avpch)
         {
             CHECK_FCT( fd_msg_avp_hdr(avpch, &hdr) );
-            hss_kdf_sqn(opc, auth_info.k, auth_info.amf,
-                    hdr->avp_value->os.data, sqn, mac_s);
+            hss_kdf_sqn(opc, auth_info.k, hdr->avp_value->os.data, sqn, mac_s);
             if (memcmp(mac_s, hdr->avp_value->os.data +
                         RAND_LEN + HSS_SQN_LEN, MAC_S_LEN) == 0)
             {
diff --git a/src/hss/hss_kdf.c b/src/hss/hss_kdf.c
index 0339a12c8..b29d21f6f 100644
--- a/src/hss/hss_kdf.c
+++ b/src/hss/hss_kdf.c
@@ -34,12 +34,12 @@ void hss_kdf_kasme(const c_uint8_t *ck, const c_uint8_t *ik,
 }
 
 void hss_kdf_sqn(
-    const c_uint8_t *opc, const c_uint8_t *k, 
-    const c_uint8_t *amf, const c_uint8_t *auts,
+    const c_uint8_t *opc, const c_uint8_t *k, const c_uint8_t *auts,
     c_uint8_t *sqn_ms, c_uint8_t *mac_s)
 {
     int i;
     c_uint8_t ak[HSS_AK_LEN];
+    c_uint8_t amf[2] = { 0, 0 };
     const c_uint8_t *rand = auts;
     const c_uint8_t *conc_sqn_ms = auts + RAND_LEN;
 
diff --git a/src/hss/hss_kdf.h b/src/hss/hss_kdf.h
index 0de5cf13f..4a46d7710 100644
--- a/src/hss/hss_kdf.h
+++ b/src/hss/hss_kdf.h
@@ -11,8 +11,7 @@ CORE_DECLARE(void) hss_kdf_kasme(const c_uint8_t *ck, const c_uint8_t *ik,
         c_uint8_t *kasme);
 
 CORE_DECLARE(void) hss_kdf_sqn(
-    const c_uint8_t *opc, const c_uint8_t *k, 
-    const c_uint8_t *amf, const c_uint8_t *auts,
+    const c_uint8_t *opc, const c_uint8_t *k, const c_uint8_t *auts,
     c_uint8_t *sqn_ms, c_uint8_t *mac_s);
 
 #endif /* __HSS_KDF_H__ */
diff --git a/test/attach_test.c b/test/attach_test.c
index d346e38dc..df4a4a7d1 100644
--- a/test/attach_test.c
+++ b/test/attach_test.c
@@ -1034,13 +1034,9 @@ abts_suite *test_attach(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
-#if 0
     abts_run_test(suite, attach_test1, NULL);
-#endif
     abts_run_test(suite, attach_test2, NULL);
-#if 0
     abts_run_test(suite, attach_test3, NULL);
-#endif
 
     return suite;
 }