diff --git a/Source/dump.f90 b/Source/dump.f90
index 7f6fb8cc262..79fcd4795d9 100644
--- a/Source/dump.f90
+++ b/Source/dump.f90
@@ -2090,8 +2090,10 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
       WRITE(MYSTR,'(1X,A)') 'WAYPOINTS '; CALL ADDSTR
       WRITE(MYSTR,'(1X,I0)') DUCT(N)%N_WAYPOINTS; CALL ADDSTR
       IF (DUCT(N)%N_WAYPOINTS > 0) THEN
-         WRITE(MYSTR,'(1X,3F12.5)') (DUCT(N)%WAYPOINT_XYZ(NN,1),DUCT(N)%WAYPOINT_XYZ(NN,2),&
-                                     DUCT(N)%WAYPOINT_XYZ(NN,3),NN=1,DUCT(N)%N_WAYPOINTS); CALL ADDSTR
+         DO NN=1,DUCT(N)%N_WAYPOINTS
+            WRITE(MYSTR,'(1X,3F12.5)') DUCT(N)%WAYPOINT_XYZ(NN,1),DUCT(N)%WAYPOINT_XYZ(NN,2),&
+                                     DUCT(N)%WAYPOINT_XYZ(NN,3); CALL ADDSTR
+         ENDDO
       ENDIF
    ENDDO