fixed for rails 4.1.1