[TIMOB-18295] Bug Fix
Merge pull request #55 from vishalduggal/timob-18295

[TIMOB-18295] Bug Fix