[TIMOB-1510] Bug Fix