diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 749b21ac..29527b57 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -19,7 +19,12 @@ class Admin::TagsController < ApplicationController
   end
 
   def create
-    @tag = (params[:tag][:module_app_id].blank? ? Tag.create(params[:tag]) : ModuleAppTag.create(params[:tag]))
+    if params[:tag][:module_app_id].blank?
+      @tag = Tag.create(params[:tag])
+    else
+      module_app = ModuleApp.find(params[:tag][:module_app_id])
+      @tag = eval("#{module_app.key.capitalize}Tag").create(params[:tag])
+    end
   end
 
   def update
diff --git a/vendor/built_in_modules/announcement/app/models/module_app_tag.rb b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb
similarity index 58%
rename from vendor/built_in_modules/announcement/app/models/module_app_tag.rb
rename to vendor/built_in_modules/announcement/app/models/announcement_tag.rb
index 0ee739f9..2eac0102 100644
--- a/vendor/built_in_modules/announcement/app/models/module_app_tag.rb
+++ b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb
@@ -1,4 +1,4 @@
-class ModuleAppTag < Tag
+class AnnouncementTag < Tag
   
   has_and_belongs_to_many :bulletins
   
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index b4362b22..6097251b 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -8,7 +8,7 @@ class Bulletin
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_one :subtitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
-  has_and_belongs_to_many :tags, :class_name => "ModuleAppTag"
+  has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
 
   field :postdate , :type => Date
   field :deadline , :type => Date