Fix a possible deadlock scenario in the impossible scenario from the last patch.