diff --git a/views2inc/node_gallery_views_handler_image_count.inc b/views2inc/node_gallery_views_handler_image_count.inc
index 41918c9..ecfc735 100644
--- a/views2inc/node_gallery_views_handler_image_count.inc
+++ b/views2inc/node_gallery_views_handler_image_count.inc
@@ -6,9 +6,15 @@
  */
 
 class node_gallery_views_handler_image_count extends views_handler_field_numeric {
-  function query() {
-    $table = $this->ensure_my_table();
-    $sql = "SELECT COUNT(*) FROM {node_gallery_images} ng JOIN {node} n on ng.nid = n.nid WHERE n.status = 1 AND ng.gid = node.nid";
-    $this->field_alias = $this->query->add_field(NULL, "($sql)", 'image_count');
+  function render($values) {
+    $node = node_load($values->nid);
+    $gid = NULL;
+    if (in_array($node->type, (array)node_gallery_get_types('gallery'))) {
+      $gid = $node->nid;
+    }
+    elseif (in_array($node->type, (array)node_gallery_get_types('image'))) {
+      $gid = $node->gid;
+    }
+    return $gid ? node_gallery_get_image_count($gid) : NULL;
   }
-}
\ No newline at end of file
+}
