Try fix MT crash in 59baa2d