update for rails 4.1.4