MODIFIED: for using Ruby 1.8.7