Massive deadlock patch