Properly fixed tmp/restart issue