Actually fix the deadlock