FIX for rails 4