Fix deadlock :)
Fix deadlock :)