diff --git a/app/models/wiki_extensions_tag_relation.rb b/app/models/wiki_extensions_tag_relation.rb
index 1567f61..84c96f9 100644
--- a/app/models/wiki_extensions_tag_relation.rb
+++ b/app/models/wiki_extensions_tag_relation.rb
@@ -22,10 +22,10 @@ class WikiExtensionsTagRelation < ActiveRecord::Base
   validates_uniqueness_of :tag_id, :scope => :wiki_page_id
 
   def destroy
-    target_tag_id = tag_id
-    super
+    ret = super
     target_tag = WikiExtensionsTag.find(tag_id) if tag_id
-    target_tag.destroy if target_tag.page_count == 0
+    target_tag.destroy if target_tag.page_count.zero?
+    ret
   end
 
 end
diff --git a/init.rb b/init.rb
index cf1521f..fc3cd78 100644
--- a/init.rb
+++ b/init.rb
@@ -65,7 +65,7 @@
   author_url 'http://twitter.com/haru_iida'
   description 'This is a Wiki Extensions plugin for Redmine'
   url "http://www.r-labs.org/projects/r-labs/wiki/Wiki_Extensions_en"
-  version '0.8.1'
+  version '0.8.2'
   requires_redmine :version_or_higher => '3.4.0'
 
   project_module :wiki_extensions do