Fixed to comply with ruby 2.0 (I think)