diff --git a/resources/node_resource.inc b/resources/node_resource.inc
index eeac2cc..5f75a9b 100644
--- a/resources/node_resource.inc
+++ b/resources/node_resource.inc
@@ -279,6 +279,11 @@ function _node_resource_index($page = 0, $fields = '*', $parameters = array()) {
   $parameters = (array) $parameters;
   $schema = drupal_get_schema('node');
   $where = array();
+ 
+  if (empty($fields)) {
+    $fields = '*';
+  }
+ 
   $fields = db_escape_string($fields);
 
 
@@ -298,7 +303,7 @@ function _node_resource_index($page = 0, $fields = '*', $parameters = array()) {
   $where = !empty($where) ? ' WHERE '. db_escape_string(implode(' AND ', $where)) : '';
 
   // Run through db_rewrite_sql to make sure proper access checks are applied.
-  $sql = "SELECT $fields FROM {node} $where ORDER BY sticky DESC, created DESC";
+  $sql = "SELECT $fields FROM {node} n $where ORDER BY sticky DESC, created DESC";
   $sql = db_rewrite_sql($sql);
   $result = db_query_range($sql, $parameters, $page * 20, 20);