diff --git a/src/FMI1/fmi1_input_reader.c b/src/FMI1/fmi1_input_reader.c
index 0d347ce..70419ed 100644
--- a/src/FMI1/fmi1_input_reader.c
+++ b/src/FMI1/fmi1_input_reader.c
@@ -153,9 +153,9 @@ void fmi1_update_input_interpolation(fmi1_csv_input_t* indata, double t) {
             indata->interpData[i] = v1[i] * (1.0 - indata->interpLambda) + v2[i] * indata->interpLambda;
             indata->interpContinuousData[cont_i++] = indata->interpData[i];
         } else {
-            /*discrete real, no interpolation*/
+            /* discrete real, no interpolation */
             fmi1_real_t* v1 = (fmi1_real_t*)jm_vector_get_item(jm_voidp)(indata->realInputData,indata->discreteIndex);
-            indata->interpData[i] =  *v1;
+            indata->interpData[i] = v1[i];
         }
     }
 }
diff --git a/src/FMI2/fmi2_input_reader.c b/src/FMI2/fmi2_input_reader.c
index 43d828e..2f932c7 100644
--- a/src/FMI2/fmi2_input_reader.c
+++ b/src/FMI2/fmi2_input_reader.c
@@ -136,7 +136,6 @@ void fmi2_update_input_interpolation(fmi2_csv_input_t* indata, double t) {
         indata->interpIndex1 = indata->interpIndex2 - 1;
 		t1 = jm_vector_get_item(double)(&indata->timeStamps, indata->interpIndex1);
 		indata->interpLambda = (t - t1)/(t2 -t1);
-
 	}
 
 	for(i = 0; i < fmi2_import_get_variable_list_size(indata->realInputs); i++) {
@@ -147,9 +146,9 @@ void fmi2_update_input_interpolation(fmi2_csv_input_t* indata, double t) {
 			fmi2_real_t* v2 = (fmi2_real_t*)jm_vector_get_item(jm_voidp)(indata->realInputData,indata->interpIndex2);
 			indata->interpData[i] = v1[i] * (1.0 - indata->interpLambda) + v2[i] * indata->interpLambda;
         } else {
-            /*discrete real, no interpolation*/
+            /* discrete real, no interpolation */
 			fmi2_real_t* v1 = (fmi2_real_t*)jm_vector_get_item(jm_voidp)(indata->realInputData,indata->discreteIndex);
-			indata->interpData[i] =  *v1;
+			indata->interpData[i] = v1[i];
 		}
 	}
 }