[TIMOB-17806] Bug Fix