[TIMOB-14936] Bug Fix