diff --git a/node_revision_delete.module b/node_revision_delete.module
index 1d42330..c2b5c9d 100755
--- a/node_revision_delete.module
+++ b/node_revision_delete.module
@@ -310,23 +310,20 @@ function _node_revision_delete_candidates($content_type, $minimum_revisions_to_k
   $params = array(
     ':content_type' => $content_type,
     ':max_revisions' => $minimum_revisions_to_keep,
+    ':age' => strtotime($minimum_age_to_delete . ' months ago'),
+    ':when' => strtotime($when_to_delete . ' months ago'),
   );
 
-  /*
-   *  TODO: Add other variables.
-   * if (!$minimum_age_to_delete && !$when_to_delete) {
-   */
   $result = db_query('SELECT r.nid, count(*) as total
                      FROM {node} n
                      INNER JOIN {node_revision} r ON r.nid = n.nid
                      WHERE n.type = :content_type
+                     AND r.timestamp > :age
+                     AND n.changed > :when
                      GROUP BY r.nid
                      HAVING count(*) > :max_revisions
                      ORDER BY total DESC', $params);
   return $result->fetchCol();
-  /*
-   * }
-   */
 }
 
 /**