remove new race condition [squash]