Update to work with ruby 1.8.7