Fix map reduce maintenance

Fixed #2354