Fix for Rails 4.1