diff --git a/.gitignore b/.gitignore
index 87ea055d..11926349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ tmp
 .bundle
 Gemfile.lock
 gemfiles/*.lock
+*.rbc
diff --git a/.travis.yml b/.travis.yml
index 765604cf..c95e0162 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
+  - rbx-2.0
   - jruby
 
 before_script:
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
index d9962053..0268ac07 100644
--- a/gemfiles/3.0.gemfile
+++ b/gemfiles/3.0.gemfile
@@ -3,12 +3,12 @@
 source "http://rubygems.org"
 
 gem "rake", "~> 0.9.2"
-gem "sqlite3", :platform=>:ruby
-gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "jdbc-sqlite3", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
 gem "jruby-openssl", :platform=>:jruby
 gem "shoulda-context", "~> 1.0.0.beta1"
+gem "activerecord-jdbc-adapter", :platform=>:jruby
+gem "jdbc-sqlite3", :platform=>:jruby
 gem "rails", "3.0.10"
 
 gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
index 4538bada..49c1aa48 100644
--- a/gemfiles/3.1.gemfile
+++ b/gemfiles/3.1.gemfile
@@ -3,16 +3,16 @@
 source "http://rubygems.org"
 
 gem "rake", "~> 0.9.2"
-gem "sqlite3", :platform=>:ruby
-gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "jdbc-sqlite3", :platform=>:jruby
+gem "sqlite3", :platform=>:ruby
 gem "jruby-openssl", :platform=>:jruby
 gem "shoulda-context", "~> 1.0.0.beta1"
-gem "rails", "3.1.0"
-gem "uglifier"
-gem "jquery-rails"
 gem "coffee-rails"
+gem "uglifier"
 gem "sass-rails"
+gem "activerecord-jdbc-adapter", :platform=>:jruby
+gem "jdbc-sqlite3", :platform=>:jruby
+gem "jquery-rails"
+gem "rails", "3.1.0"
 
 gemspec :path=>"../"
\ No newline at end of file
diff --git a/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb b/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
index 87f4d4fe..52082b94 100644
--- a/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
+++ b/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
@@ -68,6 +68,7 @@ module Shoulda # :nodoc:
         def flash
           return @flash if @flash
           @flash = @controller.flash.dup
+          @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
           @flash.sweep unless @now
           @flash
         end