Fix race
Fix another bug