Another thread safety change