[TIMOB-13491] Bug fix