A fix for Ruby2...& my issue!