Slight improvement

More threadsafe.