Try to make rails 4.x happy