Make 'thread safe' code actually thread safe...