Solve deadlock