Deadlock fix...