Refactoring

fix for ruby-1.8.7