Modify workaround code of commit '7eec43edb55b0b3fcab1623aa1e0d86b0e25a111'