timob-13686: fix threading issue.