diff --git a/src/arkode/fmod_int32/farkode_lsrkstep_mod.c b/src/arkode/fmod_int32/farkode_lsrkstep_mod.c
index a4252c2162..f08d1f6bce 100644
--- a/src/arkode/fmod_int32/farkode_lsrkstep_mod.c
+++ b/src/arkode/fmod_int32/farkode_lsrkstep_mod.c
@@ -400,15 +400,15 @@ SWIGEXPORT int _wrap_FLSRKStepSetSSPStageNum(void *farg1, int const *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FLSRKStepGetNumRhsEvals(void *farg1, long *farg2, long *farg3) {
+SWIGEXPORT int _wrap_FLSRKStepGetNumRhsEvals(void *farg1, int const *farg2, long *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  long *arg2 = (long *) 0 ;
+  int arg2 ;
   long *arg3 = (long *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (long *)(farg2);
+  arg2 = (int)(*farg2);
   arg3 = (long *)(farg3);
   result = (int)LSRKStepGetNumRhsEvals(arg1,arg2,arg3);
   fresult = (int)(result);
diff --git a/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90 b/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90
index 18a74e1368..8fcf4e0aeb 100644
--- a/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90
+++ b/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90
@@ -171,7 +171,7 @@ function swigc_FLSRKStepGetNumRhsEvals(farg1, farg2, farg3) &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
+integer(C_INT), intent(in) :: farg2
 type(C_PTR), value :: farg3
 integer(C_INT) :: fresult
 end function
@@ -427,21 +427,21 @@ function FLSRKStepSetSSPStageNum(arkode_mem, num_of_stages) &
 swig_result = fresult
 end function
 
-function FLSRKStepGetNumRhsEvals(arkode_mem, fe_evals, fi_evals) &
+function FLSRKStepGetNumRhsEvals(arkode_mem, num_rhs_fn, f_evals) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: arkode_mem
-integer(C_LONG), dimension(*), target, intent(inout) :: fe_evals
-integer(C_LONG), dimension(*), target, intent(inout) :: fi_evals
+integer(C_INT), intent(in) :: num_rhs_fn
+integer(C_LONG), dimension(*), target, intent(inout) :: f_evals
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
+integer(C_INT) :: farg2 
 type(C_PTR) :: farg3 
 
 farg1 = arkode_mem
-farg2 = c_loc(fe_evals(1))
-farg3 = c_loc(fi_evals(1))
+farg2 = num_rhs_fn
+farg3 = c_loc(f_evals(1))
 fresult = swigc_FLSRKStepGetNumRhsEvals(farg1, farg2, farg3)
 swig_result = fresult
 end function
diff --git a/src/arkode/fmod_int64/farkode_lsrkstep_mod.c b/src/arkode/fmod_int64/farkode_lsrkstep_mod.c
index a4252c2162..f08d1f6bce 100644
--- a/src/arkode/fmod_int64/farkode_lsrkstep_mod.c
+++ b/src/arkode/fmod_int64/farkode_lsrkstep_mod.c
@@ -400,15 +400,15 @@ SWIGEXPORT int _wrap_FLSRKStepSetSSPStageNum(void *farg1, int const *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FLSRKStepGetNumRhsEvals(void *farg1, long *farg2, long *farg3) {
+SWIGEXPORT int _wrap_FLSRKStepGetNumRhsEvals(void *farg1, int const *farg2, long *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  long *arg2 = (long *) 0 ;
+  int arg2 ;
   long *arg3 = (long *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (long *)(farg2);
+  arg2 = (int)(*farg2);
   arg3 = (long *)(farg3);
   result = (int)LSRKStepGetNumRhsEvals(arg1,arg2,arg3);
   fresult = (int)(result);
diff --git a/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90 b/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90
index 18a74e1368..8fcf4e0aeb 100644
--- a/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90
+++ b/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90
@@ -171,7 +171,7 @@ function swigc_FLSRKStepGetNumRhsEvals(farg1, farg2, farg3) &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
 type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
+integer(C_INT), intent(in) :: farg2
 type(C_PTR), value :: farg3
 integer(C_INT) :: fresult
 end function
@@ -427,21 +427,21 @@ function FLSRKStepSetSSPStageNum(arkode_mem, num_of_stages) &
 swig_result = fresult
 end function
 
-function FLSRKStepGetNumRhsEvals(arkode_mem, fe_evals, fi_evals) &
+function FLSRKStepGetNumRhsEvals(arkode_mem, num_rhs_fn, f_evals) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: arkode_mem
-integer(C_LONG), dimension(*), target, intent(inout) :: fe_evals
-integer(C_LONG), dimension(*), target, intent(inout) :: fi_evals
+integer(C_INT), intent(in) :: num_rhs_fn
+integer(C_LONG), dimension(*), target, intent(inout) :: f_evals
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
+integer(C_INT) :: farg2 
 type(C_PTR) :: farg3 
 
 farg1 = arkode_mem
-farg2 = c_loc(fe_evals(1))
-farg3 = c_loc(fi_evals(1))
+farg2 = num_rhs_fn
+farg3 = c_loc(f_evals(1))
 fresult = swigc_FLSRKStepGetNumRhsEvals(farg1, farg2, farg3)
 swig_result = fresult
 end function