Move the check to restart