deadlock fix?