diff --git a/CHANGES b/CHANGES
index 144eb9fd1b..75107d2496 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.1-664 | 2013-05-28 21:37:46 -0700
+
+  * Dangling pointer fix. Addresses #1004. (Jon Siwek)
+
 2.1-659 | 2013-05-24 17:24:18 -0700
 
   * Fix broken/missing documentation. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 494bc9cb81..688d60ec69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-659
+2.1-664
diff --git a/src/Sessions.cc b/src/Sessions.cc
index 2e5a6ded30..00f3bd539c 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -1159,12 +1159,12 @@ Connection* NetSessions::NewConn(HashKey* k, double t, const ConnID* id,
 	if ( ! WantConnection(src_h, dst_h, tproto, flags, flip) )
 		return 0;
 
+	ConnID flip_id = *id;
+
 	if ( flip )
 		{
 		// Make a guess that we're seeing the tail half of
 		// an analyzable connection.
-		ConnID flip_id = *id;
-
 		const IPAddr ta = flip_id.src_addr;
 		flip_id.src_addr = flip_id.dst_addr;
 		flip_id.dst_addr = ta;