Possible deadlock fix?