diff --git a/3.0/modules/date_tag/helpers/date_tag.php b/3.0/modules/date_tag/helpers/date_tag.php
index 424cdf15..87023fff 100644
--- a/3.0/modules/date_tag/helpers/date_tag.php
+++ b/3.0/modules/date_tag/helpers/date_tag.php
@@ -21,8 +21,13 @@ class date_tag {
   static function tag_item($item) {
 
     if ($item->is_photo() && $item->captured) {
-      tag::add($item, date("F", $item->captured));
-      tag::add($item, date("Y", $item->captured));
+      $date_format = "F, Y";
+      foreach (explode(",", date($date_format, $item->captured)) as $tag_name) {
+        $tag_name = trim($tag_name);
+        if ($tag_name) {
+          tag::add($item, $tag_name);
+        }
+      }
     }
     return;
   }