[TIMOB-16628] Bug Fix