[TIMOB-14233] Bug Fix