Fix ruby 2.1; take 2