Fixed deadlock caused by 964b84811db755a850cf6aa1566fb794775713db