Updated for rails 3.2.12