Be more thread safe