diff --git a/kernel/riscv64/scal.c b/kernel/riscv64/scal.c
index 4ef49e293..6c713aa18 100644
--- a/kernel/riscv64/scal.c
+++ b/kernel/riscv64/scal.c
@@ -48,7 +48,10 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
 	{
 
 		if ( da == 0.0 )
-			x[i]=0.0;
+			if (isfinite(x[i]))
+				x[i]=0.0;
+			else
+				x[i]=NAN;
 		else
 			x[i] = da * x[i] ;
 
diff --git a/kernel/riscv64/scal_vector.c b/kernel/riscv64/scal_vector.c
index 8fa9315f6..a1ba41c4f 100644
--- a/kernel/riscv64/scal_vector.c
+++ b/kernel/riscv64/scal_vector.c
@@ -71,7 +71,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
         FLOAT_V_T v0, v1;
         unsigned int gvl = 0;
         if(inc_x == 1){
-                if(da == 0.0){
+                if (0){ //if(da == 0.0){
                         memset(&x[0], 0, n * sizeof(FLOAT));
                 }else{
                         gvl = VSETVL(n);
@@ -96,7 +96,7 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da, FLOAT *x, BLAS
                         }
                 }
         }else{
-                if(da == 0.0){
+                if (0) { //if(da == 0.0){
                         BLASLONG stride_x = inc_x * sizeof(FLOAT);
                         BLASLONG ix = 0;
                         gvl = VSETVL(n);
diff --git a/kernel/riscv64/zscal.c b/kernel/riscv64/zscal.c
index c4855f73e..8499145f4 100644
--- a/kernel/riscv64/zscal.c
+++ b/kernel/riscv64/zscal.c
@@ -61,9 +61,9 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r,FLOAT da_i, F
 			{
 				temp = - da_i * x[ip+1] ;
 				if (isnan(x[ip]) || isinf(x[ip])) temp = NAN;
-				if (!isinf(x[ip+1])) 
+				if (!isinf(x[ip+1]))
 					x[ip+1] = da_i * x[ip]  ;
-				else 	x[ip+1] = NAN;
+				else	x[ip+1] = NAN;
 			}
 		}
 		else