[TIMOB-14103] Bug Fix