diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 4032eb67..00000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm use 1.8.7@cancan --create
diff --git a/lib/cancan/model_adapters/active_record_adapter.rb b/lib/cancan/model_adapters/active_record_adapter.rb
index 6856bb7b..7d8e68da 100644
--- a/lib/cancan/model_adapters/active_record_adapter.rb
+++ b/lib/cancan/model_adapters/active_record_adapter.rb
@@ -102,7 +102,8 @@ def database_records
         elsif @model_class.respond_to?(:where) && @model_class.respond_to?(:joins)
           mergeable_conditions = @rules.select {|rule| rule.unmergeable? }.blank?
           if mergeable_conditions
-            @model_class.where(conditions).joins(joins)
+            #@model_class.where(conditions).joins(joins)
+            @model_class.where(conditions).includes(joins)
           else
             @model_class.where(*(@rules.map(&:conditions))).joins(joins)
           end