diff --git a/lib/acts_as_taggable_on/taggable.rb b/lib/acts_as_taggable_on/taggable.rb
index dd97299b8..8297cae2b 100644
--- a/lib/acts_as_taggable_on/taggable.rb
+++ b/lib/acts_as_taggable_on/taggable.rb
@@ -88,14 +88,17 @@ def self.taggable?
             end
 
             include ActsAsTaggableOn::Utils
-            include ActsAsTaggableOn::Taggable::Core
-            include ActsAsTaggableOn::Taggable::Collection
-            include ActsAsTaggableOn::Taggable::Cache
-            include ActsAsTaggableOn::Taggable::Ownership
-            include ActsAsTaggableOn::Taggable::Related
-            include ActsAsTaggableOn::Taggable::Dirty
           end
         end
+
+        # each of these add context-specific methods and must be
+        # called on each call of taggable_on
+        include ActsAsTaggableOn::Taggable::Core
+        include ActsAsTaggableOn::Taggable::Collection
+        include ActsAsTaggableOn::Taggable::Cache
+        include ActsAsTaggableOn::Taggable::Ownership
+        include ActsAsTaggableOn::Taggable::Related
+        include ActsAsTaggableOn::Taggable::Dirty
       end
 
   end