Fix: Deadlock