Fix to allow restart on bad mapping