Final fix on map reduce