Fix for Rails 4 support