prepared for rails 4.1.x