[TIMOB-17876] Bug Fix