Use proper data race avoidance