remove thread safety check