upgrade for Rails 4.1