Fix for rails 4.1