fix master for rails 3.2