Made compatible with Ruby >= 1.8.7