Bug fix for rails 4.1