removed possible deadlock