Rails 3.1 compatibility