Race conditions

07a88cd address an issue where