[TIMOB-11869] Another bug fix.