[TIMOB-15486] Bug fix