Thread safety

:tada: