Fix to work with Rails 4