Should be threadsafe now