Fix for Rails 4.0