diff --git a/.CHANGELOG.swp b/.CHANGELOG.swp
new file mode 100644
index 0000000..e3de5c4
Binary files /dev/null and b/.CHANGELOG.swp differ
diff --git a/.liquid.gemspec.swp b/.liquid.gemspec.swp
new file mode 100644
index 0000000..7848d1b
Binary files /dev/null and b/.liquid.gemspec.swp differ
diff --git a/CHANGELOG b/CHANGELOG
index 02920ab..9d127d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Make context and assign work the same
+
 * Ruby 1.9.1 bugfixes
 
 * Fix LiquidView for Rails 2.2. Fix local assigns for all versions of Rails
diff --git a/lib/liquid/tags/assign.rb b/lib/liquid/tags/assign.rb
index 6d9f55f..61e837f 100644
--- a/lib/liquid/tags/assign.rb
+++ b/lib/liquid/tags/assign.rb
@@ -23,11 +23,11 @@ module Liquid
     end
   
     def render(context)
-       context.scopes.last[@to.to_s] = context[@from]
+       context.scopes.last[@to] = context[@from]
        ''
     end 
   
   end  
   
   Template.register_tag('assign', Assign)  
-end
\ No newline at end of file
+end
diff --git a/lib/liquid/tags/capture.rb b/lib/liquid/tags/capture.rb
index a0cbe34..89591a4 100644
--- a/lib/liquid/tags/capture.rb
+++ b/lib/liquid/tags/capture.rb
@@ -26,7 +26,7 @@ module Liquid
 
     def render(context)
       output = super
-      context.scopes.last[@to.to_s] = output.join
+      context.scopes.last[@to] = output.join
       ''
     end
   end
diff --git a/liquid.gemspec b/liquid.gemspec
index c761b66..a2b5966 100644
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{liquid}
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Luetke"]