Fixed: Deadlock