Now works on Ruby >= 1.8.7