[TIMOB-15446] Bug fix