diff --git a/src/sf_binlog_writer.c b/src/sf_binlog_writer.c
index f809070..6f3a3cb 100644
--- a/src/sf_binlog_writer.c
+++ b/src/sf_binlog_writer.c
@@ -629,26 +629,28 @@ int sf_binlog_writer_notify_exit(SFBinlogWriterInfo *writer)
 void sf_push_to_binlog_write_queue(SFBinlogWriterInfo *writer,
         SFBinlogWriterBuffer *buffer)
 {
+    time_t current_time;
     int64_t last_timestamp;
 
+    current_time = g_current_time;
     last_timestamp = FC_ATOMIC_GET(writer->thread->flow_ctrol.last_timestamp);
-    if ((last_timestamp > 0 && g_current_time - last_timestamp > writer->
+    if ((last_timestamp > 0 && current_time - last_timestamp > writer->
                 thread->flow_ctrol.max_delay) && !(writer->order_by ==
                     SF_BINLOG_WRITER_TYPE_ORDER_BY_VERSION && buffer->
                     version.first - writer->version_ctx.next < 128))
     {
-        time_t start_time;
         time_t last_log_timestamp;
         int time_used;
         int log_level;
 
-        start_time = g_current_time;
         PTHREAD_MUTEX_LOCK(&writer->thread->flow_ctrol.lcp.lock);
         writer->thread->flow_ctrol.waiting_count++;
         last_timestamp = FC_ATOMIC_GET(writer->thread->
                 flow_ctrol.last_timestamp);
-        while (last_timestamp > 0 && g_current_time - last_timestamp >
-                writer->thread->flow_ctrol.max_delay)
+        while ((last_timestamp > 0 && current_time - last_timestamp > writer->
+                    thread->flow_ctrol.max_delay) && !(writer->order_by ==
+                        SF_BINLOG_WRITER_TYPE_ORDER_BY_VERSION && buffer->
+                        version.first - writer->version_ctx.next < 128))
         {
             pthread_cond_wait(&writer->thread->flow_ctrol.lcp.cond,
                     &writer->thread->flow_ctrol.lcp.lock);
@@ -658,7 +660,7 @@ void sf_push_to_binlog_write_queue(SFBinlogWriterInfo *writer,
         writer->thread->flow_ctrol.waiting_count--;
         PTHREAD_MUTEX_UNLOCK(&writer->thread->flow_ctrol.lcp.lock);
 
-        time_used = g_current_time - start_time;
+        time_used = g_current_time - current_time;
         if (time_used > 0) {
             last_log_timestamp = FC_ATOMIC_GET(
                     LAST_BINLOG_WRITER_LOG_TIMESTAMP);