Fix for Rails 4 and Ruby 2+