fixing races. jonathan is my race detector. mine is broken.