Fix bug in threadsafety code

Barry Smith requested to merge barry/2024-05-14/fix-threadsafety-bug/release into release May 14, 2024