Made this work with rails 3.2