hack to get the race condition at bay