Fixed for Rails 4.1