diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 56e3d75c411c01f4ae4f6c3f6ced13d9d8841305..d1f212435fb62b084313b8388dfdcc6a7cd9555c 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -439,9 +439,9 @@ function poll_load($nodes) {
     $poll->choice = db_select('poll_choice', 'c')
       ->addTag('translatable')
       ->fields('c', array('chid', 'chtext', 'chvotes', 'weight'))
-      ->condition('c', 'nid', $node->nid)
+      ->condition('c.nid', $node->nid)
       ->orderBy('weight')
-      ->fetchAllAssoc('chid', PDO::FETCH_ASSOC);
+      ->execute()->fetchAllAssoc('chid', PDO::FETCH_ASSOC);
 
     // Determine whether or not this user is allowed to vote.
     $poll->allowvotes = FALSE;