Fixed out-of-order message deadlock