Try to fix async race condition for the umpteenth time