Significant improvement on Thread safety, still observed 1 crash on iPhone