Tweaking logic to determine if segments need to be fetched