diff --git a/src/main/swiftest_driver.f90 b/src/main/swiftest_driver.f90
index 55eb1bc89..3d4c35aab 100644
--- a/src/main/swiftest_driver.f90
+++ b/src/main/swiftest_driver.f90
@@ -17,11 +17,11 @@ program swiftest_driver
    integer(I8B)                               :: iloop            !! Loop counter
    integer(I8B)                               :: idump            !! Dump cadence counter
    integer(I8B)                               :: iout             !! Output cadence counter
-   !integer(I8B), parameter                    :: LOOPMAX = huge(iloop) !! Maximum loop value before resetting 
    integer(I8B)                               :: nloops           !! Number of steps to take in the simulation
    real(DP)                                   :: start_wall_time  !! Wall clock time at start of execution
    real(DP)                                   :: finish_wall_time !! Wall clock time when execution has finished
    integer(I4B)                               :: iu               !! Unit number of binary file
+
    character(*),parameter :: statusfmt  = '("Time = ", ES12.5, "; fraction done = ", F6.3, "; ' // &
                                              'Number of active pl, tp = ", I5, ", ", I5)'
 
@@ -52,7 +52,7 @@ program swiftest_driver
       iloop = 0
       iout = istep_out
       idump = istep_dump
-      nloops = ceiling(tstop / dt)
+      nloops = ceiling(tstop / dt, kind=I8B)
       if (istep_out > 0) call nbody_system%write_frame(iu, param)
       !> Define the maximum number of threads
       nthreads = 1            ! In the *serial* case