Make work with rails 4.1