fix deadlock issue from previos modification