Match is now threadsafe