diff --git a/lib/xenu_nntp/message.py b/lib/xenu_nntp/message.py
index 7f4d07d..cd3bb0c 100644
--- a/lib/xenu_nntp/message.py
+++ b/lib/xenu_nntp/message.py
@@ -84,7 +84,7 @@ class MessageRange():
         if self.min is not None and self.max is None:
             return "%s >= %d" % (column, self.min)
         elif self.min is not None and self.max is not None:
-            return "%s >= %d and %s <= %d" % (column, self.min, column, self.max)
+            return "%s between %d and %d" % (column, self.min, self.max)
         elif self.min is None and self.max is not None:
             return "%s <= %d" % (column, self.max)
 
diff --git a/lib/xenu_nntp/session.py b/lib/xenu_nntp/session.py
index 2372c13..1fc2322 100644
--- a/lib/xenu_nntp/session.py
+++ b/lib/xenu_nntp/session.py
@@ -558,7 +558,7 @@ class Session(Connection):
                     and newsgroup_message.newsgroup_id = %s
             """
 
-            sql += " and " + msgrange.where('newsgroup_message.message_id')
+            sql += " and " + msgrange.where('message.id')
 
             cr = self.db.query_sql(Message, sql, (self.newsgroup.id,))