Added checking for the check value so that we won't need to ad check factor if not necessary

Reviewer: Chezka Arevalo (psot commit)

Issue: GCP-9878