Patch for Rails 3.1