Fix for Rails 4.0

This supercedes #1