Fixed to work with rails 4