Merge "Fix deadlock"