Attempting to fix restart implementation