Remove a possible race when initialising the watch thread