TIMOB-6949 modified