Fix mapper restart