another thread-safety fix