Fixed Deadlock