adapt to fresh mahout