Shots in the dark to fix race conditions we've seen