Make everything still work under ruby 1.8.7