Fix cp30 DEADLOCK issue.