diff --git a/ggml/src/ggml-cuda/iqk_mmvq.cu b/ggml/src/ggml-cuda/iqk_mmvq.cu
index 1e1077a3..e7a821a9 100644
--- a/ggml/src/ggml-cuda/iqk_mmvq.cu
+++ b/ggml/src/ggml-cuda/iqk_mmvq.cu
@@ -281,40 +281,7 @@ __device__ __forceinline__ void vec_dot_iq4_k_r4_q8_1(
     const uint32_t * scales_h = (const uint32_t *)bq4->scales_h;
     scales = __vsub4(((scales_l[2*(ib32%4)+is] >> 4*(ib32/4)) & 0x0f0f0f0f) | (((scales_h[2*(ib32%2)+is] >> 2*(ib32/2)) & 0x03030303) << 4), 0x20202020);
     const int8_t * s8 = (const int8_t *)&scales;
-    int2 val1, val2;
-    const int * q4 = (const int *)bq4->qs + 16*ib32;
-    for (int i = 0; i < 4; ++i) {
-        auto values1 = iq4k_values + (((bq4->extra[i+4*is] >> ib32) & 1) << 4);
-        int sumi1 = 0;
-        val1  = get_int_from_table_16(q4[i+4*is+0], values1);
-        sumi1 = ggml_cuda_dp4a(val1.x, q8[0], ggml_cuda_dp4a(val1.y, q8[2], sumi1));
-        val1  = get_int_from_table_16(q4[i+4*is+8], values1);
-        sumi1 = ggml_cuda_dp4a(val1.x, q8[1], ggml_cuda_dp4a(val1.y, q8[3], sumi1));
-        const float d = __half2float(bq4->d[i]) * d8;
-        result[i] += d * sumi1 * s8[i];
-    }
-}
-
-__device__ __forceinline__ void vec_dot_iq5_k_r4_q8_1(
-    const void * __restrict__ vbq, const block_q8_1 * __restrict__ bq8_1, const int & kbx, const int & iqs, float * result) {
-
-    return;
-
-    const block_iq4_k_r4 * bq4 = (const block_iq4_k_r4 *)vbq + kbx;
-
-    // iqs is 0...28 in steps of 2
-    const int ib16 = iqs/2;
-    const float d8 = __low2float(bq8_1[ib16/2].ds);
-    const int32_t  * q8 = (const int *)bq8_1[ib16/2].qs + 4*(ib16%2);
-
-    int ib32 = ib16/2;
-    int is   = ib16%2;
-    int scales;
-    const uint32_t * scales_l = (const uint32_t *)bq4->scales_l;
-    const uint32_t * scales_h = (const uint32_t *)bq4->scales_h;
-    scales = __vsub4(((scales_l[2*(ib32%4)+is] >> 4*(ib32/4)) & 0x0f0f0f0f) | (((scales_h[2*(ib32%2)+is] >> 2*(ib32/2)) & 0x03030303) << 4), 0x20202020);
-    const int8_t * s8 = (const int8_t *)&scales;
-    int2 val1, val2;
+    int2 val1;
     const int * q4 = (const int *)bq4->qs + 16*ib32;
     for (int i = 0; i < 4; ++i) {
         auto values1 = iq4k_values + (((bq4->extra[i+4*is] >> ib32) & 1) << 4);
@@ -426,6 +393,46 @@ __device__ __forceinline__ void vec_dot_iq5_k_q8_1(
     *result += d5 * (__low2float(bq8_1[2*(i4/2)+0].ds) * sumi1 * ls1 + __low2float(bq8_1[2*(i4/2)+1].ds) * sumi2 * ls2);
 }
 
+__device__ __forceinline__ void vec_dot_iq5_k_r4_q8_1(
+    const void * __restrict__ vbq, const block_q8_1 * __restrict__ bq8_1, const int & kbx, const int & iqs, float * result) {
+
+    const block_iq5_k_r4 * bq5 = (const block_iq5_k_r4 *)vbq + kbx;
+
+    // iqs is 0...28 in steps of 2
+    const int ib16 = iqs/2;
+    const float d8 = __low2float(bq8_1[ib16/2].ds);
+    const int32_t  * q8 = (const int *)bq8_1[ib16/2].qs + 4*(ib16%2);
+
+    int ib32 = ib16/2;
+    int is   = ib16%2;
+    int scales;
+    const uint32_t * scales_l = (const uint32_t *)bq5->scales_l;
+    const uint32_t * scales_h = (const uint32_t *)bq5->scales_h;
+    scales = __vsub4(((scales_l[2*(ib32%4)+is] >> 4*(ib32/4)) & 0x0f0f0f0f) | (((scales_h[2*(ib32%2)+is] >> 2*(ib32/2)) & 0x03030303) << 4), 0x20202020);
+    const int8_t * s8 = (const int8_t *)&scales;
+    int2 val1;
+    const int * q4 = (const int *)bq5->qs + 16*ib32;
+    const int * qh = (const int *)bq5->qh +  4*ib32;
+    int aux32[2];
+    const uint8_t * aux8 = (const uint8_t *)aux32;
+    for (int i = 0; i < 4; ++i) {
+        auto values1 = iq5nl_values + (((bq5->extra[i+4*is] >> ib32) & 1) << 5);
+        int sumi1 = 0;
+        aux32[0] = ((q4[i+4*is+0] >> 0) & 0x0f0f0f0f) | (((qh[i] >> (2*is+0)) & 0x01010101) << 4);
+        aux32[1] = ((q4[i+4*is+0] >> 4) & 0x0f0f0f0f) | (((qh[i] >> (2*is+1)) & 0x01010101) << 4);
+        val1.x  = int_from_table(aux8+0, (const uint8_t *)values1);
+        val1.y  = int_from_table(aux8+4, (const uint8_t *)values1);
+        sumi1 = ggml_cuda_dp4a(val1.x, q8[0], ggml_cuda_dp4a(val1.y, q8[2], sumi1));
+        aux32[0] = ((q4[i+4*is+8] >> 0) & 0x0f0f0f0f) | (((qh[i] >> (2*is+4)) & 0x01010101) << 4);
+        aux32[1] = ((q4[i+4*is+8] >> 4) & 0x0f0f0f0f) | (((qh[i] >> (2*is+5)) & 0x01010101) << 4);
+        val1.x  = int_from_table(aux8+0, (const uint8_t *)values1);
+        val1.y  = int_from_table(aux8+4, (const uint8_t *)values1);
+        sumi1 = ggml_cuda_dp4a(val1.x, q8[1], ggml_cuda_dp4a(val1.y, q8[3], sumi1));
+        const float d = __half2float(bq5->d[i]) * d8;
+        result[i] += d * sumi1 * s8[i];
+    }
+}
+
 __device__ __forceinline__ void vec_dot_iq5_ks_q8_1(
     const void * __restrict__ vbq, const block_q8_1 * __restrict__ bq8_1, const int & kbx, const int & iqs, float * result) {