Another thread-safety fix