updated from rails 1.2.3