Fix logical deadlock issue