Make Ruby 1.8.7 compliant