Fixing Rails 4 compat