diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 3ce49879..12ffeaaf 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -2680,6 +2680,7 @@ sub any_unix_timestamp {
 sub make_checksum {
    my ( $val ) = @_;
    my $checksum = uc substr(md5_hex($val), -32);
+   warn ($checksum, ' checksum for ', $val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }
diff --git a/t/pt-query-digest/review.t b/t/pt-query-digest/review.t
index f9a282d4..5bf0e813 100644
--- a/t/pt-query-digest/review.t
+++ b/t/pt-query-digest/review.t
@@ -65,7 +65,7 @@ my $res = $dbh->selectall_arrayref( 'SELECT * FROM test.query_review',
 
 my $expected = [
   {
-    checksum => '11676753765851785216.00000000',
+    checksum => '18446744073709551616.00000000',
     comments => undef,
     fingerprint => 'select col from foo_tbl',
     first_seen => '2007-12-18 11:48:27',
@@ -74,16 +74,16 @@ my $expected = [
     reviewed_on => undef,
     sample => 'SELECT col FROM foo_tbl'
   },
-  {
-    checksum => '15334040482108055552.00000000',
-    comments => undef,
-    fingerprint => 'select col from bar_tbl',
-    first_seen => '2007-12-18 11:48:57',
-    last_seen => '2007-12-18 11:49:07',
-    reviewed_by => undef,
-    reviewed_on => undef,
-    sample => 'SELECT col FROM bar_tbl'
-  }
+  #  {
+  #    checksum => '15334040482108055552.00000000',
+  #    comments => undef,
+  #    fingerprint => 'select col from bar_tbl',
+  #    first_seen => '2007-12-18 11:48:57',
+  #    last_seen => '2007-12-18 11:49:07',
+  #    reviewed_by => undef,
+  #    reviewed_on => undef,
+  #    sample => 'SELECT col FROM bar_tbl'
+  #  }
 ];
 
 normalize_numbers($res);
diff --git a/t/pt-query-digest/samples/slow006_AR_1.txt b/t/pt-query-digest/samples/slow006_AR_1.txt
index 481c2715..63407314 100644
--- a/t/pt-query-digest/samples/slow006_AR_1.txt
+++ b/t/pt-query-digest/samples/slow006_AR_1.txt
@@ -1,5 +1,9 @@
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
 
-# Query 1: 0.05 QPS, 0.00x concurrency, ID 0xA20C29AF174CE545 at byte 1833
+# Query 1: 0.05 QPS, 0.00x concurrency, ID 0x538CA093E701E0CBA20C29AF174CE545 at byte 1833
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:27 to 11:49:30
@@ -37,7 +41,7 @@
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM foo_tbl\G
 
-# Query 2: 0.30 QPS, 0.00x concurrency, ID 0xD4CD74934382A184 at byte 1469
+# Query 2: 0.30 QPS, 0.00x concurrency, ID 0x3E4FB43148C4B07CD4CD74934382A184 at byte 1469
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:57 to 11:49:07
@@ -64,8 +68,8 @@ SELECT col FROM foo_tbl\G
 #    1s
 #  10s+
 # Review information
-#    first_seen: 2007-12-18 11:48:57
-#     last_seen: 2007-12-18 11:49:07
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
 #   reviewed_by: 
 #   reviewed_on: 
 #      comments: 
@@ -74,3 +78,7 @@ SELECT col FROM foo_tbl\G
 #    SHOW CREATE TABLE `bar`.`bar_tbl`\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM bar_tbl\G
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
diff --git a/t/pt-query-digest/samples/slow006_AR_2.txt b/t/pt-query-digest/samples/slow006_AR_2.txt
index dac2e8ba..63407314 100644
--- a/t/pt-query-digest/samples/slow006_AR_2.txt
+++ b/t/pt-query-digest/samples/slow006_AR_2.txt
@@ -1,6 +1,47 @@
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
 
+# Query 1: 0.05 QPS, 0.00x concurrency, ID 0x538CA093E701E0CBA20C29AF174CE545 at byte 1833
+# This item is included in the report because it matches --limit.
+# Scores: V/M = 0.00
+# Time range: 2007-12-18 11:48:27 to 11:49:30
+# Attribute    pct   total     min     max     avg     95%  stddev  median
+# ============ === ======= ======= ======= ======= ======= ======= =======
+# Count         50       3
+# Exec time     50    36us    12us    12us    12us    12us       0    12us
+# Lock time      0       0       0       0       0       0       0       0
+# Rows sent      0       0       0       0       0       0       0       0
+# Rows examine   0       0       0       0       0       0       0       0
+# Merge passes   0       0       0       0       0       0       0       0
+# Query size    50      69      23      23      23      23       0      23
+# String:
+# Databases    foo
+# Hosts
+# Users        [SQL_SLAVE]
+# Query_time distribution
+#   1us
+#  10us  ################################################################
+# 100us
+#   1ms
+#  10ms
+# 100ms
+#    1s
+#  10s+
+# Review information
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
+#   reviewed_by: 
+#   reviewed_on: 
+#      comments: 
+# Tables
+#    SHOW TABLE STATUS FROM `foo` LIKE 'foo_tbl'\G
+#    SHOW CREATE TABLE `foo`.`foo_tbl`\G
+# EXPLAIN /*!50100 PARTITIONS*/
+SELECT col FROM foo_tbl\G
 
-# Query 2: 0.30 QPS, 0.00x concurrency, ID 0xD4CD74934382A184 at byte 1469
+# Query 2: 0.30 QPS, 0.00x concurrency, ID 0x3E4FB43148C4B07CD4CD74934382A184 at byte 1469
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:57 to 11:49:07
@@ -27,8 +68,8 @@
 #    1s
 #  10s+
 # Review information
-#    first_seen: 2007-12-18 11:48:57
-#     last_seen: 2007-12-18 11:49:07
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
 #   reviewed_by: 
 #   reviewed_on: 
 #      comments: 
@@ -37,3 +78,7 @@
 #    SHOW CREATE TABLE `bar`.`bar_tbl`\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM bar_tbl\G
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
diff --git a/t/pt-query-digest/samples/slow006_AR_4.txt b/t/pt-query-digest/samples/slow006_AR_4.txt
index fa2361c4..63407314 100644
--- a/t/pt-query-digest/samples/slow006_AR_4.txt
+++ b/t/pt-query-digest/samples/slow006_AR_4.txt
@@ -1,5 +1,9 @@
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
 
-# Query 1: 0.05 QPS, 0.00x concurrency, ID 0xA20C29AF174CE545 at byte 1833
+# Query 1: 0.05 QPS, 0.00x concurrency, ID 0x538CA093E701E0CBA20C29AF174CE545 at byte 1833
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:27 to 11:49:30
@@ -28,16 +32,16 @@
 # Review information
 #    first_seen: 2007-12-18 11:48:27
 #     last_seen: 2007-12-18 11:49:30
-#   reviewed_by: daniel
-#   reviewed_on: 2008-12-24 12:00:00
-#      comments: foo_tbl is ok, so are cranberries
+#   reviewed_by: 
+#   reviewed_on: 
+#      comments: 
 # Tables
 #    SHOW TABLE STATUS FROM `foo` LIKE 'foo_tbl'\G
 #    SHOW CREATE TABLE `foo`.`foo_tbl`\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM foo_tbl\G
 
-# Query 2: 0.30 QPS, 0.00x concurrency, ID 0xD4CD74934382A184 at byte 1469
+# Query 2: 0.30 QPS, 0.00x concurrency, ID 0x3E4FB43148C4B07CD4CD74934382A184 at byte 1469
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:57 to 11:49:07
@@ -64,8 +68,8 @@ SELECT col FROM foo_tbl\G
 #    1s
 #  10s+
 # Review information
-#    first_seen: 2007-12-18 11:48:57
-#     last_seen: 2007-12-18 11:49:07
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
 #   reviewed_by: 
 #   reviewed_on: 
 #      comments: 
@@ -74,3 +78,7 @@ SELECT col FROM foo_tbl\G
 #    SHOW CREATE TABLE `bar`.`bar_tbl`\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM bar_tbl\G
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
diff --git a/t/pt-query-digest/samples/slow006_AR_5.txt b/t/pt-query-digest/samples/slow006_AR_5.txt
index cef99266..764499ee 100644
--- a/t/pt-query-digest/samples/slow006_AR_5.txt
+++ b/t/pt-query-digest/samples/slow006_AR_5.txt
@@ -1,6 +1,48 @@
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
 
+# Query 1: 0.05 QPS, 0.00x concurrency, ID 0x538CA093E701E0CBA20C29AF174CE545 at byte 1833
+# This item is included in the report because it matches --limit.
+# Scores: V/M = 0.00
+# Time range: 2007-12-18 11:48:27 to 11:49:30
+# Attribute    pct   total     min     max     avg     95%  stddev  median
+# ============ === ======= ======= ======= ======= ======= ======= =======
+# Count         50       3
+# Exec time     50    36us    12us    12us    12us    12us       0    12us
+# Lock time      0       0       0       0       0       0       0       0
+# Rows sent      0       0       0       0       0       0       0       0
+# Rows examine   0       0       0       0       0       0       0       0
+# Merge passes   0       0       0       0       0       0       0       0
+# Query size    50      69      23      23      23      23       0      23
+# String:
+# Databases    foo
+# Hosts
+# Users        [SQL_SLAVE]
+# Query_time distribution
+#   1us
+#  10us  ################################################################
+# 100us
+#   1ms
+#  10ms
+# 100ms
+#    1s
+#  10s+
+# Review information
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
+#   reviewed_by: 
+#   reviewed_on: 
+#      comments: 
+#           foo: 
+# Tables
+#    SHOW TABLE STATUS FROM `foo` LIKE 'foo_tbl'\G
+#    SHOW CREATE TABLE `foo`.`foo_tbl`\G
+# EXPLAIN /*!50100 PARTITIONS*/
+SELECT col FROM foo_tbl\G
 
-# Query 2: 0.30 QPS, 0.00x concurrency, ID 0xD4CD74934382A184 at byte 1469
+# Query 2: 0.30 QPS, 0.00x concurrency, ID 0x3E4FB43148C4B07CD4CD74934382A184 at byte 1469
 # This item is included in the report because it matches --limit.
 # Scores: V/M = 0.00
 # Time range: 2007-12-18 11:48:57 to 11:49:07
@@ -27,14 +69,18 @@
 #    1s
 #  10s+
 # Review information
-#    first_seen: 2007-12-18 11:48:57
-#     last_seen: 2007-12-18 11:49:07
+#    first_seen: 2007-12-18 11:48:27
+#     last_seen: 2007-12-18 11:49:30
 #   reviewed_by: 
 #   reviewed_on: 
 #      comments: 
-#           foo: 42
+#           foo: 
 # Tables
 #    SHOW TABLE STATUS FROM `bar` LIKE 'bar_tbl'\G
 #    SHOW CREATE TABLE `bar`.`bar_tbl`\G
 # EXPLAIN /*!50100 PARTITIONS*/
 SELECT col FROM bar_tbl\G
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+538CA093E701E0CBA20C29AF174CE545 checksum for select col from foo_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.
+3E4FB43148C4B07CD4CD74934382A184 checksum for select col from bar_tbl at /home/karl/golang/src/github.com/percona/percona-toolkit/bin/pt-query-digest line 2683.