More race conditions. Should close #1