diff --git a/ChangeLog b/ChangeLog
index 349efeb..efe2e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-08  David Schweikert  <david@schweikert.ch>
+  * Version 3.8
+  * Fix segmentation fault introduced in version 3.7 with loop mode (#55)
+
 2013-11-04  David Schweikert  <david@schweikert.ch>
   * Version 3.7
   * Allow running as non-root on Mac OS X by using non-privileged ICMP (#7)
diff --git a/src/fping.c b/src/fping.c
index ec9318c..8316cc3 100644
--- a/src/fping.c
+++ b/src/fping.c
@@ -1604,7 +1604,7 @@ int wait_for_reply(long wait_time)
     this_count = seqmap_value->ping_count;
     this_reply = timeval_diff( &current_time, sent_time );
 
-    if( h->resp_times[this_count] == RESP_WAITING )
+    if( loop_flag || h->resp_times[this_count] == RESP_WAITING )
     {
         /* only for non-duplicates: */
         h->waiting = 0;