[TIMOB-17678] Another bug fix.