fix for ruby 1.8.7 and a bug