deadlock fix (1)