fixed TIMOB-16240