TIMOB-5996 modified