MODE-1993 Changed place of event count down to fix race condition