Ensure rails 4.1 compatibility