Fixed rails 4.1 compability