Upgrade to be compatible with rails 3.2