Patched to work with ruby 2.1