diff --git a/raw_socket_listener/listener_test.go b/raw_socket_listener/listener_test.go
index 2a6d9c0..e29e25f 100644
--- a/raw_socket_listener/listener_test.go
+++ b/raw_socket_listener/listener_test.go
@@ -62,7 +62,7 @@ func nextPacket(prev *TCPPacket, payload []byte) *TCPPacket {
 		prev.Ack,
 		prev.Seq+uint32(len(prev.Data)),
 		payload,
-		time.Now(),
+		prev.timestamp.Add(time.Millisecond),
 	)
 }
 
@@ -72,7 +72,7 @@ func responsePacket(prev *TCPPacket, payload []byte) *TCPPacket {
 		prev.Seq+uint32(len(prev.Data)),
 		prev.Ack,
 		payload,
-		time.Now(),
+		prev.timestamp.Add(time.Millisecond),
 	)
 }
 
diff --git a/raw_socket_listener/tcp_message.go b/raw_socket_listener/tcp_message.go
index cb15b9b..27c65dd 100644
--- a/raw_socket_listener/tcp_message.go
+++ b/raw_socket_listener/tcp_message.go
@@ -130,16 +130,15 @@ func (t *TCPMessage) AddPacket(packet *TCPPacket) {
 				}
 			}
 		}
-
 		if packet.OrigAck != 0 {
 			t.DataAck = packet.OrigAck
 		}
 
-		if packet.timestamp.Before(t.Start) {
+		if packet.timestamp.Before(t.Start) || t.Start.IsZero() {
 			t.Start = packet.timestamp
 		}
 
-		if t.End.IsZero() || t.End.Before(packet.timestamp) {
+		if packet.timestamp.After(t.End) || t.End.IsZero() {
 			t.End = packet.timestamp
 		}
 	}