change to allow rails 4