[TIMOB-14360] Avoid overflow
Merge pull request #4471 from vishalduggal/timob-14360

[TIMOB-14360] Avoid overflow