diff --git a/flippy.module b/flippy.module
index dd9d3f5..4a9c41b 100644
--- a/flippy.module
+++ b/flippy.module
@@ -216,13 +216,21 @@ function flippy_build_list($node) {
 
     $prev = clone $query;
     $list['prev'] = $prev
-      ->condition('created', $node->created, '<=')
+      ->condition(db_or()
+        ->condition('created', $node->created, '<')
+        ->condition(db_and()
+          ->condition('created', $node->created, '=')
+          ->condition('nid', $node->nid, '<')))
       ->orderBy('created', 'DESC')
       ->execute()->fetchAssoc();
 
     $next = clone $query;
     $list['next'] = $next
-      ->condition('created', $node->created, '>=')
+      ->condition(db_or()
+        ->condition('created', $node->created, '>')
+        ->condition(db_and()
+          ->condition('created', $node->created, '=')
+          ->condition('nid', $node->nid, '>')))
       ->orderBy('created', 'ASC')
       ->execute()->fetchAssoc();