[TIMOB-13827] Bug fix