Update for working with Rails 4.1.6