Deadlock fix?