New version to handle Rails 4.1