Should be thread-safe now