Restart bugfix