Fixed for Rails 4