fixed to work with MapReduce v2