fix issues with rails 3.2+