fix ruby 1.8.7 issue
merge conflicts