diff --git a/Changelog.md b/Changelog.md
index d894417..e92b526 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,10 @@
 Changelog
 =
 
+Version 0.0.7
+-
+* Fix A Major Bug that copies the _local.js template instead of _callbacks.js
+
 Version 0.0.6
 -
 * `SetupGenerator` moved from `paloma_generator.rb` to `paloma/generators/setup_generator.rb`
diff --git a/lib/paloma/generators/add_generator.rb b/lib/paloma/generators/add_generator.rb
index c18f4b3..df0b3b6 100644
--- a/lib/paloma/generators/add_generator.rb
+++ b/lib/paloma/generators/add_generator.rb
@@ -62,7 +62,7 @@ module Paloma
     
     def generate_from_template destination_filename
       filename = destination_filename.split('/').last
-      content = File.read("#{Paloma.templates}/_local.js").gsub(/controller/, @controller_name)
+      content = File.read("#{Paloma.templates}/#{filename}").gsub(/controller/, @controller_name)
       File.open(destination_filename, 'w'){ |f| f.write(content) }
     end 
   end
diff --git a/paloma.gemspec b/paloma.gemspec
index 862ceaa..fdf3c79 100644
--- a/paloma.gemspec
+++ b/paloma.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '0.0.6'
+  s.version     = '0.0.7'
   s.summary     = "a sexy way to organize javascript files using Rails` asset pipeline"
   s.description = "a sexy way to organize javascript files using Rails` asset pipeline"
   s.authors     = ["Karl Paragua", "Bia Esmero"]
diff --git a/spec/generator_spec.rb b/spec/generator_spec.rb
index 96219a9..d8d6ec9 100644
--- a/spec/generator_spec.rb
+++ b/spec/generator_spec.rb
@@ -80,6 +80,11 @@ feature Paloma::AddGenerator, 'creating action with existing controller folder'
           file 'new_action.js' do
             contains "Paloma.callbacks['existing_controller_folder/new_action']"
           end
+          
+          file '_callbacks.js' do
+            contains "//= require ./existing_controller_folder/_local"
+            contains "//= require_tree ."
+          end
         end
       end
     }