More Ruby 1.8.6 compatibility