#202 and #201: fixed restart aftermath