Fixed for Ruby => 2.0.0