Fix TIMOB-12275