few things that might get the race condition bug fixed